added logic for notifications service