WIP: Add notifications support