#403 Add Temporal handling