Add notification handler with responses
Added comments