Improvements to data parsing