Better History data schema