Refactor notification accessors