Simplify client generation

@sivy This line will compatible with old style constructor usage