Revert "Revert "Updated client libs""

This reverts commit e7237ca6cc05cb3567bce8e9b122af657b0808d5.
Refined module code.