Updated to work with latest Ecommerce suite.