diff --git a/app/src/main/java/code/name/monkey/retromusic/room/NowPlayingQueue.kt b/app/src/main/java/code/name/monkey/retromusic/room/NowPlayingQueue.kt
index f10a59631..8032691df 100644
--- a/app/src/main/java/code/name/monkey/retromusic/room/NowPlayingQueue.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/room/NowPlayingQueue.kt
@@ -8,7 +8,7 @@ import kotlinx.coroutines.launch
 
 class NowPlayingQueue(context: Context) {
 
-    private val queueDao = MusicPlaybackQueueStoreDatabase.getMusicDatabase(context).queueDao()
+    private val queueDao = QueueStoreDatabase.getMusicDatabase(context).queueDao()
 
     private val musicQueueRepository: MusicQueueRepository = MusicQueueRepository(queueDao)
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/room/MusicPlaybackQueueStoreDatabase.kt b/app/src/main/java/code/name/monkey/retromusic/room/QueueStoreDatabase.kt
similarity index 68%
rename from app/src/main/java/code/name/monkey/retromusic/room/MusicPlaybackQueueStoreDatabase.kt
rename to app/src/main/java/code/name/monkey/retromusic/room/QueueStoreDatabase.kt
index f9233c7b9..e6c45e783 100644
--- a/app/src/main/java/code/name/monkey/retromusic/room/MusicPlaybackQueueStoreDatabase.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/room/QueueStoreDatabase.kt
@@ -6,24 +6,23 @@ import androidx.room.Room
 import androidx.room.RoomDatabase
 
 @Database(entities = [SongEntity::class], version = 2, exportSchema = false)
-abstract class MusicPlaybackQueueStoreDatabase : RoomDatabase() {
+abstract class QueueStoreDatabase : RoomDatabase() {
 
     abstract fun queueDao(): QueueDao
 
     companion object {
         @Volatile
-        private var INSTANCE: MusicPlaybackQueueStoreDatabase? = null
+        private var INSTANCE: QueueStoreDatabase? = null
 
-        fun getMusicDatabase(context: Context): MusicPlaybackQueueStoreDatabase {
-            val tempInstance =
-                INSTANCE
+        fun getMusicDatabase(context: Context): QueueStoreDatabase {
+            val tempInstance = INSTANCE
             if (tempInstance != null) {
                 return tempInstance
             }
             synchronized(this) {
                 val instance = Room.databaseBuilder(
                     context.applicationContext,
-                    MusicPlaybackQueueStoreDatabase::class.java,
+                    QueueStoreDatabase::class.java,
                     "music_playback_state"
                 ).fallbackToDestructiveMigration().build()
                 INSTANCE = instance
diff --git a/app/src/main/java/code/name/monkey/retromusic/room/playlist/PlaylistEntity.kt b/app/src/main/java/code/name/monkey/retromusic/room/playlist/PlaylistEntity.kt
new file mode 100644
index 000000000..610295648
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/room/playlist/PlaylistEntity.kt
@@ -0,0 +1,14 @@
+package code.name.monkey.retromusic.room.playlist
+
+import androidx.room.ColumnInfo
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import code.name.monkey.retromusic.room.SongEntity
+
+@Entity(tableName = "playlist_entity")
+data class PlaylistEntity(
+    @PrimaryKey(autoGenerate = true) @ColumnInfo(name = "id") val playlistId: Int,
+    @ColumnInfo(name = "playlist_name") val playlistName: String?,
+    @Embedded val songs: List<SongEntity>?
+)
\ No newline at end of file