Adding ASM-CSM mapping features