Split creating client code