Update Product and ProductPackage relationship

They now extend from a ProductBase class