refactored some mappings