Improved client interface