Improve remappings more