Added new ASM-CSM mapping logic