Client.js improvements