Add graceful shutdown
Updates