Add CXType support