change to 1-to-Many relationship, add product fields