Making the client more friendly