Separated notifications, added Bundle