Implement a locking mechanism for Runner, allowing for batched retry, and fixing naming scheme