Made client available from the beginning.