Added stuff for parsing delimited files