notifications dao refactoring