Added more field defs.