Removed references to base/Product class