Updated event,user classes