WCS performance improvement