Some improvement in the client