Client base (16/21)

Client base