Altering Client to allow passing of custom params