Revert "merge the stat and data records"
Merge pull request #677 from andreasgal/revert-647-merge-stat

Revert "merge the stat and data records"