Added more flexibility to construction of CLP