Should we make this version agnostic and leave to client/server version negotiation?