Changed common timestamp structure into separate structures so the timestamps are identified by name.