Updated client module and docs