Notifier and model fix