Add interval support