FluentClient refactoring.