Client lib (23/24)

Client lib