Added implementation of MessageController