Added FieldsFunc & Fields