Split the object design of remap