Used OOPackage object instead of the Tree
Authored by: ahmedaly 2011-10-19
Parent: [r531]
Child: [r533]
