Added TastingRecord2 and related classes. FIX entity type strings on other Helpers