Rework classes/notification types