Refactor driver to use static methods