Added yarrp support & updated woocommerce support