Fixed missing use for FieldDef
Refactored