Moved subjectClass from notificationEvent entity to notificationKey entity