Can now handle shutdown of service