Feature/oc with cpp