Switch data model a bit to support history fetching better.