WLang: adaptation to new WLang structure