WIP: Add notification support