Merged EventDecorator service into eventService