Rewrite to work with CGEcommerceBase v1.6.x