Improved CDT generation