Question and UserService updated