Added stops and calendars with importers