Updated for WooCommerce 2.2