More changes to date structures