Adding the base client code