diff --git a/file/model.go b/file/model.go
index bbd1bb7..22a8aa0 100644
--- a/file/model.go
+++ b/file/model.go
@@ -1,6 +1,7 @@
 package file
 
 import (
+	"git.rwth-aachen.de/acs/public/villas/villasweb-backend-go/user"
 	"github.com/jinzhu/gorm"
 	"time"
 )
diff --git a/project/model.go b/project/model.go
index e154892..c88d730 100644
--- a/project/model.go
+++ b/project/model.go
@@ -1,9 +1,10 @@
 package project
 
 import (
+	"git.rwth-aachen.de/acs/public/villas/villasweb-backend-go/simulation"
+	"git.rwth-aachen.de/acs/public/villas/villasweb-backend-go/user"
 	"git.rwth-aachen.de/acs/public/villas/villasweb-backend-go/visualization"
 	"github.com/jinzhu/gorm"
-	// XXX: We don't need also User and Simulation???
 )
 
 type Project struct {
diff --git a/simulation/model.go b/simulation/model.go
index 066eae6..17bca5e 100644
--- a/simulation/model.go
+++ b/simulation/model.go
@@ -1,9 +1,10 @@
 package simulation
 
 import (
-	"git.rwth-aachen.de/acs/public/villas/villasweb-backend-go/visualization"
+	"git.rwth-aachen.de/acs/public/villas/villasweb-backend-go/project"
+	"git.rwth-aachen.de/acs/public/villas/villasweb-backend-go/simulationModel"
+	"git.rwth-aachen.de/acs/public/villas/villasweb-backend-go/user"
 	"github.com/jinzhu/gorm"
-	// XXX: What about other models??
 )
 
 type Simulation struct {
diff --git a/simulationModel/model.go b/simulationModel/model.go
index 4e1d2ba..d9c1a46 100644
--- a/simulationModel/model.go
+++ b/simulationModel/model.go
@@ -1,8 +1,9 @@
 package simulationModel
 
 import (
+	"git.rwth-aachen.de/acs/public/villas/villasweb-backend-go/simulation"
+	"git.rwth-aachen.de/acs/public/villas/villasweb-backend-go/simulator"
 	"github.com/jinzhu/gorm"
-	// XXX: other models
 )
 
 type SimulationModel struct {
diff --git a/visualization/model.go b/visualization/model.go
index 9226441..02aeb5e 100644
--- a/visualization/model.go
+++ b/visualization/model.go
@@ -1,6 +1,7 @@
 package visualization
 
 import (
+	"git.rwth-aachen.de/acs/public/villas/villasweb-backend-go/user"
 	"github.com/jinzhu/gorm"
 )