Refactor to use new new cloudhub client api