Added Client for test purpose.