Updated code to match the new Driver/Main versions.