Added more requirements for notifications