Add controller remapping