eCommerce enhancements

and here