Added notify support
Completed