added support for type