Updated client api