Merge in new Time/Date-functionality