Removed KeepAlive and added ChatMessage