Added base client code