Version with a command handler
P2P chats improved