Update lotus, prepare for lotus console
Improve client implementation