Modifications to TextReaderto suuport a more modular architecture