Expect EventDispatcherInterface instead of EventDispatcher
Added ACL and CalDAV plugins