Added WSD as a feature