Added Scanner changes for TNV.