Adding client code