Notification refactoring
Queue refactoring