Implement CS update to point on next CFG
Change storing strategy for cfgs