Added timeout to the notifications