Add support for type