Update wrapper xml classes and refactor methods

Change-Id: I23c0fd039d4a7ea92ecb3a3bf41084ff4ee3c9b0
Add Disk OM

Change-Id: Iff9fd347f218a54181056773d25e56fe98634022