Adding more wait times after service shutdown and restart