Modified driver to be dependency injected into core class