Added notification support