Improve server start stop and restart operations