Moved Interval outside of AFE class