Added fields.toMap()