Update for CWF 3.1