Added a couple more field defs.