Final changes for CFG with other class methods