We'll think about it once we get back to notifications re-factoring and unfortunately I'm guessing it's quite a distance future. Right now, I've got green light from @themech and you, so I'll merge this branch to notifications branch and it'll wait for brighter times ;) I think we could rename it to NotificationEntity :)