[Wen Hao] - Added all fields in Builder.