Changes to 'uidmap-management'