Add CXType support

Something else I found that I need.