Changed to domain event instead of service