More early stage wcs support