Added base classes for ProductOption and ProductOptionValue