Add remaining CPP function statements