Changes for notifications