Improve remap command