Add support for CWM