diff --git a/app/task/project/loadotio/loadotio.cpp b/app/task/project/loadotio/loadotio.cpp
index 3861eb2e6..c6cbfdb36 100644
--- a/app/task/project/loadotio/loadotio.cpp
+++ b/app/task/project/loadotio/loadotio.cpp
@@ -29,8 +29,8 @@
 
 #include "node/block/clip/clip.h"
 #include "node/block/gap/gap.h"
-#include "node/input/media/media.h"
 #include "project/item/folder/folder.h"
+#include "project/item/footage/footage.h"
 #include "project/item/sequence/sequence.h"
 #include "widget/timelinewidget/timelineundo.h"
 
@@ -81,11 +81,9 @@ bool LoadOTIOTask::Run()
 
   foreach (auto timeline, timelines) {
     Sequence* sequence = new Sequence();
-    sequence->set_name(QString::fromStdString(timeline->name()));
+    sequence->SetLabel(QString::fromStdString(timeline->name()));
     sequence->setParent(project_->root());
 
-    ViewerOutput* seq_viewer = sequence->viewer_output();
-
     // FIXME: As far as I know, OTIO doesn't store video/audio parameters?
     sequence->set_default_parameters();
 
@@ -105,7 +103,7 @@ bool LoadOTIOTask::Run()
           type = Track::kAudio;
         }
 
-        TimelineAddTrackCommand t(seq_viewer->track_list(type));
+        TimelineAddTrackCommand t(sequence->track_list(type));
         t.redo();
         track = t.track();
       } else {
@@ -164,24 +162,22 @@ bool LoadOTIOTask::Run()
             if (imported_footage.contains(footage_url)) {
               probed_item = imported_footage.value(footage_url);
             } else {
-              probed_item = Decoder::Probe(project_, footage_url, &IsCancelled());
+              probed_item = new Footage(footage_url);
               imported_footage.insert(footage_url, probed_item);
               probed_item->setParent(project_->root());
             }
 
-            if (probed_item && probed_item->type() == Item::kFootage) {
-              MediaInput* media = new MediaInput();
-              if (track->type() == Track::kVideo) {
-                media->SetStream(probed_item->get_first_enabled_stream_of_type(Stream::kVideo));
-              } else {
-                media->SetStream(probed_item->get_first_enabled_stream_of_type(Stream::kAudio));
-              }
-              media->setParent(sequence);
+            Footage::StreamReference reference;
 
-              Node::ConnectEdge(media, static_cast<ClipBlock*>(block)->texture_input());
+            if (track->type() == Track::kVideo) {
+              reference = Footage::StreamReference(Stream::kVideo, 0);
             } else {
-              // FIXME: Add to some kind of list that we couldn't find it
+              reference = Footage::StreamReference(Stream::kAudio, 0);
             }
+
+            QString output_id = probed_item->GetStringFromReference(reference);
+
+            Node::ConnectEdge(NodeOutput(probed_item, output_id), NodeInput(block, ClipBlock::kBufferIn));
           }
         }
 
diff --git a/app/task/project/saveotio/saveotio.cpp b/app/task/project/saveotio/saveotio.cpp
index f0e1b5d3f..8f19bbe29 100644
--- a/app/task/project/saveotio/saveotio.cpp
+++ b/app/task/project/saveotio/saveotio.cpp
@@ -27,7 +27,6 @@
 #include <opentimelineio/transition.h>
 
 #include "node/block/transition/transition.h"
-#include "node/input/media/media.h"
 
 namespace olive {
 
@@ -39,7 +38,7 @@ SaveOTIOTask::SaveOTIOTask(Project *project) :
 
 bool SaveOTIOTask::Run()
 {
-  QVector<Item*> sequences = project_->get_items_of_type(Item::kSequence);
+  QVector<Sequence*> sequences = project_->root()->ListOutputsOfType<Sequence>();
 
   if (sequences.isEmpty()) {
     SetError(tr("Project contains no sequences to export."));
@@ -63,7 +62,7 @@ bool SaveOTIOTask::Run()
       }
 
       // Error out of function
-      SetError(tr("Failed to serialize sequence \"%1\"").arg(seq->name()));
+      SetError(tr("Failed to serialize sequence \"%1\"").arg(seq->GetLabel()));
 
       return false;
     }
@@ -93,10 +92,10 @@ bool SaveOTIOTask::Run()
 
 opentimelineio::v1_0::Timeline *SaveOTIOTask::SerializeTimeline(Sequence *sequence)
 {
-  auto otio_timeline = new opentimelineio::v1_0::Timeline(sequence->name().toStdString());
+  auto otio_timeline = new opentimelineio::v1_0::Timeline(sequence->GetLabel().toStdString());
 
-  if (!SerializeTrackList(sequence->viewer_output()->track_list(Track::kVideo), otio_timeline)
-      || !SerializeTrackList(sequence->viewer_output()->track_list(Track::kAudio), otio_timeline)) {
+  if (!SerializeTrackList(sequence->track_list(Track::kVideo), otio_timeline)
+      || !SerializeTrackList(sequence->track_list(Track::kAudio), otio_timeline)) {
     otio_timeline->possibly_delete();
     return nullptr;
   }
@@ -133,9 +132,9 @@ opentimelineio::v1_0::Track *SaveOTIOTask::SerializeTrack(Track *track)
       otio_clip->set_source_range(opentimelineio::v1_0::TimeRange(block->in().toRationalTime(),
                                                                   block->length().toRationalTime()));
 
-      QVector<MediaInput*> media_nodes = block->FindInputNodes<MediaInput>();
+      QVector<Footage*> media_nodes = block->FindInputNodes<Footage>();
       if (!media_nodes.isEmpty()) {
-        auto media_ref = new opentimelineio::v1_0::ExternalReference(media_nodes.first()->stream()->footage()->filename().toStdString());
+        auto media_ref = new opentimelineio::v1_0::ExternalReference(media_nodes.first()->filename().toStdString());
         otio_clip->set_media_reference(media_ref);
       }