Mapping class refactored