Add new readers, fix loop issue