Change WC to use Values