Work on remap class