Major update to integrate release 5 of CGP