Improved data and data parsing