Modified notifications structure to allow for easier integration of message notifications
Added message notifications