[Fix] Refactor Notification creation
[Fix] Add NotificationsCreator