Added the changes for cf and type flags.