Modernize client code (#6250)