Fixed Field_count; More work is needed on FieldsAdding