Simplify the mappings