Added UserService and setup for refactored Context