Updates to Service Tracking