Updated client services TODO