More design changes for WCS