Fixed versions to use the new reader