Better Handling of Intervals