adding notification support