Porting Criteria to CPP - on the way