Allow for component remapping