-REF notification refactoring