Notifications performance improvements and more...