Additional changes to CFG construction logic