Feature/update cpgf