Improved client code