Refactor to use CWConditionalLog