Added GroupEvents
Major updates