Complete Event support for the new Server