Add support for type/uri