Improve: make CWM better use