Added support for type extensions