Added FieldID to identify fields
Added FieldID to FieldDefinition
Sorted the column headers and added tests