Adding remaps