Added members and elements to the ASM-CSM mapping DSL