Reworked timestamps in data model