Add optimisation for extension ce_groups #3