Updated to 3.1, remove necessity for EventManagement module