Updated WC support