Update to more service-centered copy