Too much was removed, Modify mappings