Client class splitted