Update to meet Timerange contract