Applying changes suggested by @WouterJ, adding lazy_services to components map