Updated client accessor