first pass at supporting new api client (v0.5)