Adapt to new A1Client interface