Added support for type inheritance