Add code to facilitate large-scale parsing