Finish updating fields with new structure for Field extends;