Added few other dependencies
Removed class reference, the inheritance tree is enough.