Added more client code