[Client] Expanding protocol