Rework custom mappings