Improved client functionality.