CWD: updates to api compatibilty