Further updates to Products/Package Gateway