Refactor how cpu flags are added.