Added recreation of Product set, and added cascade remove and update