diff --git a/Projects/Domains/AppDomain/Project.swift b/Projects/Domains/AppDomain/Project.swift
index 18e049163..54dd17947 100644
--- a/Projects/Domains/AppDomain/Project.swift
+++ b/Projects/Domains/AppDomain/Project.swift
@@ -5,12 +5,17 @@ import ProjectDescriptionHelpers
 let project = Project.module(
     name: ModulePaths.Domain.AppDomain.rawValue,
     targets: [
-        .interface(module: .domain(.AppDomain)),
+        .interface(
+            module: .domain(.AppDomain),
+            dependencies: [
+                .domain(target: .BaseDomain, type: .interface)
+            ]
+        ),
         .implements(
             module: .domain(.AppDomain),
             dependencies: [
-                TargetDependency.domain(target: .BaseDomain),
-                TargetDependency.domain(target: .AppDomain, type: .interface)
+                .domain(target: .BaseDomain),
+                .domain(target: .AppDomain, type: .interface)
             ]
         ),
         .tests(
diff --git a/Projects/Domains/ArtistDomain/Project.swift b/Projects/Domains/ArtistDomain/Project.swift
index 566886f5a..209d7a380 100644
--- a/Projects/Domains/ArtistDomain/Project.swift
+++ b/Projects/Domains/ArtistDomain/Project.swift
@@ -5,7 +5,12 @@ import ProjectDescriptionHelpers
 let project = Project.module(
     name: ModulePaths.Domain.ArtistDomain.rawValue,
     targets: [
-        .interface(module: .domain(.ArtistDomain)),
+        .interface(
+            module: .domain(.ArtistDomain),
+            dependencies: [
+                .domain(target: .BaseDomain, type: .interface)
+            ]
+        ),
         .implements(
             module: .domain(.ArtistDomain),
             dependencies: [
diff --git a/Projects/Domains/AuthDomain/Project.swift b/Projects/Domains/AuthDomain/Project.swift
index 83c4528f9..54bc308ca 100644
--- a/Projects/Domains/AuthDomain/Project.swift
+++ b/Projects/Domains/AuthDomain/Project.swift
@@ -5,7 +5,12 @@ import ProjectDescriptionHelpers
 let project = Project.module(
     name: ModulePaths.Domain.AuthDomain.rawValue,
     targets: [
-        .interface(module: .domain(.AuthDomain)),
+        .interface(
+            module: .domain(.AuthDomain),
+            dependencies: [
+                .domain(target: .BaseDomain, type: .interface)
+            ]
+        ),
         .implements(
             module: .domain(.AuthDomain),
             dependencies: [
diff --git a/Projects/Domains/BaseDomain/Project.swift b/Projects/Domains/BaseDomain/Project.swift
index e36e32ceb..7278b4a70 100644
--- a/Projects/Domains/BaseDomain/Project.swift
+++ b/Projects/Domains/BaseDomain/Project.swift
@@ -5,14 +5,19 @@ import ProjectDescriptionHelpers
 let project = Project.module(
     name: ModulePaths.Domain.BaseDomain.rawValue,
     targets: [
-        .interface(module: .domain(.BaseDomain)),
+        .interface(
+            module: .domain(.BaseDomain),
+            dependencies: [
+                .Project.Module.ThirdPartyLib
+            ]
+        ),
         .implements(
             module: .domain(.BaseDomain),
             dependencies: [
                 .Project.Module.Utility,
                 .Project.Module.ErrorModule,
                 .Project.Module.KeychainModule,
-                TargetDependency.domain(target: .BaseDomain, type: .interface)
+                .domain(target: .BaseDomain, type: .interface)
             ]
         ),
         .tests(
diff --git a/Projects/Domains/ChartDomain/Project.swift b/Projects/Domains/ChartDomain/Project.swift
index a65799b2b..f0bbee73c 100644
--- a/Projects/Domains/ChartDomain/Project.swift
+++ b/Projects/Domains/ChartDomain/Project.swift
@@ -5,7 +5,12 @@ import ProjectDescriptionHelpers
 let project = Project.module(
     name: ModulePaths.Domain.ChartDomain.rawValue,
     targets: [
-        .interface(module: .domain(.ChartDomain)),
+        .interface(
+            module: .domain(.ChartDomain),
+            dependencies: [
+                .domain(target: .BaseDomain, type: .interface)
+            ]
+        ),
         .implements(
             module: .domain(.ChartDomain),
             dependencies: [
diff --git a/Projects/Domains/FaqDomain/Project.swift b/Projects/Domains/FaqDomain/Project.swift
index 6fc207355..2a0822074 100644
--- a/Projects/Domains/FaqDomain/Project.swift
+++ b/Projects/Domains/FaqDomain/Project.swift
@@ -5,7 +5,12 @@ import ProjectDescriptionHelpers
 let project = Project.module(
     name: ModulePaths.Domain.FaqDomain.rawValue,
     targets: [
-        .interface(module: .domain(.FaqDomain)),
+        .interface(
+            module: .domain(.FaqDomain),
+            dependencies: [
+                .domain(target: .BaseDomain, type: .interface)
+            ]
+        ),
         .implements(
             module: .domain(.FaqDomain),
             dependencies: [
diff --git a/Projects/Domains/LikeDomain/Project.swift b/Projects/Domains/LikeDomain/Project.swift
index 478fa283b..720dd17d3 100644
--- a/Projects/Domains/LikeDomain/Project.swift
+++ b/Projects/Domains/LikeDomain/Project.swift
@@ -5,7 +5,12 @@ import ProjectDescriptionHelpers
 let project = Project.module(
     name: ModulePaths.Domain.LikeDomain.rawValue,
     targets: [
-        .interface(module: .domain(.LikeDomain)),
+        .interface(
+            module: .domain(.LikeDomain),
+            dependencies: [
+                .domain(target: .BaseDomain, type: .interface)
+            ]
+        ),
         .implements(
             module: .domain(.LikeDomain),
             dependencies: [
diff --git a/Projects/Domains/NoticeDomain/Project.swift b/Projects/Domains/NoticeDomain/Project.swift
index f5d1dc849..a2d6f6dc7 100644
--- a/Projects/Domains/NoticeDomain/Project.swift
+++ b/Projects/Domains/NoticeDomain/Project.swift
@@ -5,7 +5,12 @@ import ProjectDescriptionHelpers
 let project = Project.module(
     name: ModulePaths.Domain.NoticeDomain.rawValue,
     targets: [
-        .interface(module: .domain(.NoticeDomain)),
+        .interface(
+            module: .domain(.NoticeDomain),
+            dependencies: [
+                .domain(target: .BaseDomain, type: .interface)
+            ]
+        ),
         .implements(
             module: .domain(.NoticeDomain),
             dependencies: [
diff --git a/Projects/Domains/PlayListDomain/Project.swift b/Projects/Domains/PlayListDomain/Project.swift
index 545fc8bf2..390876aa6 100644
--- a/Projects/Domains/PlayListDomain/Project.swift
+++ b/Projects/Domains/PlayListDomain/Project.swift
@@ -8,7 +8,8 @@ let project = Project.module(
         .interface(
             module: .domain(.PlayListDomain),
             dependencies: [
-                .domain(target: .BaseDomain, type: .interface)
+                .domain(target: .BaseDomain, type: .interface),
+                .domain(target: .SongsDomain, type: .interface)
             ]
         ),
         .implements(
diff --git a/Projects/Domains/SongsDomain/Project.swift b/Projects/Domains/SongsDomain/Project.swift
index 91210777f..0fb957f43 100644
--- a/Projects/Domains/SongsDomain/Project.swift
+++ b/Projects/Domains/SongsDomain/Project.swift
@@ -5,7 +5,12 @@ import ProjectDescriptionHelpers
 let project = Project.module(
     name: ModulePaths.Domain.SongsDomain.rawValue,
     targets: [
-        .interface(module: .domain(.SongsDomain)),
+        .interface(
+            module: .domain(.SongsDomain),
+            dependencies: [
+                .domain(target: .BaseDomain, type: .interface)
+            ]
+        ),
         .implements(
             module: .domain(.SongsDomain),
             dependencies: [
diff --git a/Projects/Domains/UserDomain/Project.swift b/Projects/Domains/UserDomain/Project.swift
index 74bb47aa1..a1c99ee04 100644
--- a/Projects/Domains/UserDomain/Project.swift
+++ b/Projects/Domains/UserDomain/Project.swift
@@ -8,6 +8,7 @@ let project = Project.module(
         .interface(
             module: .domain(.UserDomain),
             dependencies: [
+                .domain(target: .BaseDomain, type: .interface),
                 .domain(target: .SongsDomain, type: .interface)
             ]
         ),
diff --git a/graph.png b/graph.png
index b6fbf6a07..9f34c87d9 100644
Binary files a/graph.png and b/graph.png differ