CPP : Some ajustement in the model draft