Added changes for driver to work with ViPR 2.0