Refactored default event service