Fixed MappingScheme to allow Cascade