diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/SubsonicAPIConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/SubsonicAPIConverter.kt
index 4afba002..d93b5272 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/SubsonicAPIConverter.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/SubsonicAPIConverter.kt
@@ -2,6 +2,7 @@
 @file:JvmName("APIConverter")
 package org.moire.ultrasonic.data
 
+import org.moire.ultrasonic.api.subsonic.models.Album
 import org.moire.ultrasonic.api.subsonic.models.Index
 import org.moire.ultrasonic.api.subsonic.models.MusicDirectoryChild
 import org.moire.ultrasonic.domain.Artist
@@ -30,6 +31,24 @@ fun APIArtist.toDomainEntity(): Artist = Artist().apply {
     name = this@toDomainEntity.name
 }
 
+fun APIArtist.toMusicDirectoryDomainEntity(): MusicDirectory = MusicDirectory().apply {
+    name = this@toMusicDirectoryDomainEntity.name
+    addAll(this@toMusicDirectoryDomainEntity.albumsList.map { it.toDomainEntity() })
+}
+
+fun Album.toDomainEntity(): MusicDirectory.Entry = MusicDirectory.Entry().apply {
+    id = this@toDomainEntity.id.toString()
+    title = this@toDomainEntity.name
+    coverArt = this@toDomainEntity.coverArt
+    artist = this@toDomainEntity.artist
+    artistId = this@toDomainEntity.artistId.toString()
+    songCount = this@toDomainEntity.songCount.toLong()
+    duration = this@toDomainEntity.duration
+    created = this@toDomainEntity.created?.time
+    year = this@toDomainEntity.year
+    genre = this@toDomainEntity.genre
+}
+
 fun MusicDirectoryChild.toDomainEntity(): MusicDirectory.Entry = MusicDirectory.Entry().apply {
     id = this@toDomainEntity.id.toString()
     parent = this@toDomainEntity.parent.toString()
diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIConverterTest.kt
index da2f2fc1..1a7f9465 100644
--- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIConverterTest.kt
+++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIConverterTest.kt
@@ -5,6 +5,7 @@ package org.moire.ultrasonic.data
 import org.amshove.kluent.`should equal to`
 import org.amshove.kluent.`should equal`
 import org.junit.Test
+import org.moire.ultrasonic.api.subsonic.models.Album
 import org.moire.ultrasonic.api.subsonic.models.Artist
 import org.moire.ultrasonic.api.subsonic.models.Index
 import org.moire.ultrasonic.api.subsonic.models.Indexes
@@ -18,6 +19,7 @@ import java.util.Calendar
  *
  * @author Yahor Berdnikau
  */
+@Suppress("TooManyFunctions")
 class APIConverterTest {
     @Test
     fun `Should convert MusicFolder entity`() {
@@ -137,6 +139,43 @@ class APIConverterTest {
         }
     }
 
+    @Test
+    fun `Should convert Artist entity to domain MusicDirectory entity`() {
+        val entity = Artist(id = 101L, name = "artist-name", coverArt = "some-art", albumCount = 10,
+                albumsList = listOf(Album(id = 562L, name = "some-name", coverArt = "zzz",
+                        artist = "artist-name", artistId = 256L, songCount = 10, duration = 345,
+                        created = Calendar.getInstance(), year = 2011, genre = "Math Rock")))
+
+        val convertedEntity = entity.toMusicDirectoryDomainEntity()
+
+        with(convertedEntity) {
+            name `should equal to` entity.name
+            children `should equal` entity.albumsList.map { it.toDomainEntity() }.toMutableList()
+        }
+    }
+
+    @Test
+    fun `Should convert Album to domain entity`() {
+        val entity = Album(id = 387L, name = "some-name", coverArt = "asdas", artist = "some-artist",
+                artistId = 390L, songCount = 12, duration = 841, created = Calendar.getInstance(),
+                year = 2017, genre = "some-genre")
+
+        val convertedEntity = entity.toDomainEntity()
+
+        with(convertedEntity) {
+            id `should equal to` entity.id.toString()
+            title `should equal to` entity.name
+            coverArt `should equal to` entity.coverArt
+            artist `should equal to` entity.artist
+            artistId `should equal to` entity.artistId.toString()
+            songCount `should equal to` entity.songCount.toLong()
+            duration `should equal to` entity.duration
+            created `should equal` entity.created?.time
+            year `should equal to` entity.year
+            genre `should equal to` entity.genre
+        }
+    }
+
     private fun createMusicFolder(id: Long = 0, name: String = ""): MusicFolder =
             MusicFolder(id, name)