Initial WC 2.1 compatibility