176b801295fbe616689390f8ff4c11b18d1884fc added PluginData class but missed to switch the code to use the new class. Change-Id: Iee6665cd4643ad9251e8feadc31894212bd5ee4c