Added option to not map C and D