Refactor driver commands