Just need to fix mappings for A/D Cont/List and C/E