added notification support