Changing impl of driver to use new modules.