Next module: CSDTF
Basic changes