Refactored adding WMEs a little bit. Introduced a part of WMEs removal (to be continued).