Added Inheritance check and Class support