Merged in temporal functionality