Updated fixed to remove dependencies on Driver file