Add beforeNotify support, app and device diagnostics