Add hbx identifier and timestamps to all types