vcap client refactorized