Moving notifications to models