I'd rather prefer move this in the RegistrationManager as it does not manipulate entities