REFACTOR: Simplified Mapping class