Use client from index instead of passing as argument

Use client from index instead of passing as argument #1064