Service remapping support