Add possibility to pass options to client