Improve client info providing