Service Startup Related Changes