Revert "Revert "Improve field and row data parsing""

This reverts commit 1fa693f9e617e54483d03f5cae7179c8d5e2c09f.