Refactored ObjectMapping to access the other mappings via the factory