Extracting client base class

@maxfliri