Replaced validator service with aggregator service as default