Updated client service