Fixed lost Notificator classes