replaced manual UDT->EDT conversion with built in one