Refactored addMessage() in Notification to work just with default container