Refactoring to simplify mappings.