Adding Interval support