Added code to generate clients and get and set