Updated to work with CGEcommerceBase