Refactor mappings