Added in new functionality to properly load the services.