Incorporate wc_builder changes