Decouple API version from client version