               newParams["version"] = destination.version
               newParams["convert"] = false
 
-              var mediaItems: [Any] = []
-
-              if let data = try self.dataSource?.load(params: newParams) {
-                mediaItems = data
-              }
-
-              for mediaItem in mediaItems {
-                if let item = mediaItem as? [String: String],
-                   let name = item["name"],
-                   let id = item["id"] {
-                  items.append(AudioItem(name: name, id: id))
+              if let data = try self.dataSource?.load(params: newParams),
+                 let mediaItems = data as? [MediaItem] {
+                for mediaItem in mediaItems {
+                  let item = mediaItem
+
+                  items.append(AudioItem(name: item.name!, id: item.id!))
                 }
               }
 


    clearsSelectionOnViewWillAppear = false

    #if os(iOS)
      let longPressRecognizer = UILongPressGestureRecognizer(target: self, action: #selector(self.longPressed(_:)))
      collectionView?.addGestureRecognizer(longPressRecognizer)
    #endif

    collectionView?.backgroundView = activityIndicatorView


  open static let SegueIdentifier = "Media Items"
  open static let StoryboardControllerId = "MediaItemsController"
  static let BundleId = "com.rubikon.TVSetKit"

  let CellIdentifier = "MediaItemCell"

  var HeaderViewIdentifier: String { return "MediaItemsHeader" }
