Few changes to user/event