Add enhancements and new features

Refactor Notification handling and implementing online users map update