Simplify client generation