(A-CB09373): Modify structure; preserve the previous IDS as an