Updated to reflect new Woocommerce 2.1.x changes