Feature/cp graphs