improved the support to WooCommerce 2.1