Adjust for v2.4.5+ of services