Client refactorings