Additional tweaks to Stats data model