Adding notifications support