Client base (17/21)

Client base