Improve client representation