Modifications to overrider user and some other features for the service