Cleaned up UserManager a bit and fix the decorators
Clean up of decorators