Added support for virtual remaps