update to support lazy loading of main services to speed up everything