Correctly set data when a version is passed
Use retries and include the common client helpers