Add support for Inheritance