CPP utils added