Updated for version 0.07 release
Ignoring BaseClass