replace COR eval module with SAF messaging