Added Wine2
REFACTOR - entity creation and modification. ADDED wine data helper classes