Add notification support (working)