Decouple some cloud stack client code