Improved client and data interaction