Make client more clever