diff --git a/app/src/main/java/com/cappielloantonio/play/util/MappingUtil.java b/app/src/main/java/com/cappielloantonio/play/util/MappingUtil.java
index 46341ce0..97da4a80 100644
--- a/app/src/main/java/com/cappielloantonio/play/util/MappingUtil.java
+++ b/app/src/main/java/com/cappielloantonio/play/util/MappingUtil.java
@@ -100,6 +100,20 @@ public class MappingUtil {
         return songs;
     }
 
+    public static Queue mapSongToQueue(Song song) {
+        return new Queue(song.getId(), song.getTitle(), song.getAlbumId(), song.getAlbumName(), song.getArtistId(), song.getArtistName(), song.getPrimary(), song.getDuration(), 0);
+    }
+
+    public static List<Queue> mapSongsToQueue(List<Song> songs) {
+        List<Queue> queue = new ArrayList<>();
+
+        for (Song song : songs) {
+            queue.add(mapSongToQueue(song));
+        }
+
+        return queue;
+    }
+
     public static ArrayList<Playlist> mapPlaylist(List<com.cappielloantonio.play.subsonic.models.Playlist> playlists) {
         ArrayList<Playlist> playlist = new ArrayList();
 
diff --git a/app/src/main/java/com/cappielloantonio/play/util/QueueUtil.java b/app/src/main/java/com/cappielloantonio/play/util/QueueUtil.java
deleted file mode 100644
index 0ae3caa2..00000000
--- a/app/src/main/java/com/cappielloantonio/play/util/QueueUtil.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.cappielloantonio.play.util;
-
-import com.cappielloantonio.play.model.Queue;
-import com.cappielloantonio.play.model.Song;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class QueueUtil {
-    private static final String TAG = "QueueUtil";
-
-    public static List<Queue> getQueueElementsFromSongs(List<Song> songs) {
-        int counter = 0;
-        List<Queue> queue = new ArrayList<>();
-
-        for (Song song : songs) {
-            queue.add(new Queue(counter, song.getId(), song.getTitle(), song.getAlbumId(), song.getAlbumName(), song.getArtistId(), song.getArtistName(), song.getPrimary(), song.getDuration(), 0));
-            counter++;
-        }
-
-        return queue;
-    }
-}