Made changes to get Product1 to work with core.