Adding full CTW and DTM prepairs