Substantial improvements to record parse