Improving new Service Tracker