Notifications service refactor