Made client more portable