Adding support for new readers and timeout duration