Added Client-class