Modified to work with the new CGEcommerceBase