Added support for type overriding