Added basic remapping capability.