Add client libs - 2