Added for client services