Add Interval subclasses, refactor parser