A - expanded client wrapper