Add subnotify support