Fleshed out Product and Package per data definition