added wm support