Improvements for using with UDT and other modules