Removed some redefinitions of field names
Added some missing field names