Change BaseClient to ReaderClient