Modify file generator and regenerate files(Part II).