Simplify client invocation

From numion