Added UDT support. Seems to work, but not peformance tuned yet