Made changes to get Product2 to work with core