diff --git a/adapters/secondary/gateways/articleRepository.go b/adapters/secondary/gateways/articleRepository.go
index f2d87f7..34eda9d 100644
--- a/adapters/secondary/gateways/articleRepository.go
+++ b/adapters/secondary/gateways/articleRepository.go
@@ -26,7 +26,7 @@ func (a *ArticleRepository) Get(id uint32) (domain.Article, error) {
 		return domain.Article{}, err
 	}
 
-	return domain.FromDb(article.ID, article.Title, article.Body, article.CreatedAt, article.UpdatedAt), nil
+	return mapArticleToDomain(article), nil
 }
 
 func (a *ArticleRepository) Create(article domain.Article) (domain.Article, error) {
@@ -41,13 +41,7 @@ func (a *ArticleRepository) Create(article domain.Article) (domain.Article, erro
 	var createdArticle entity.Article
 	creationResult.Scan(&createdArticle)
 
-	return domain.FromDb(
-			createdArticle.ID,
-			createdArticle.Title,
-			createdArticle.Body,
-			createdArticle.CreatedAt,
-			createdArticle.UpdatedAt),
-		nil
+	return mapArticleToDomain(createdArticle), nil
 }
 
 func (a *ArticleRepository) GetAll() []domain.Article {
diff --git a/adapters/secondary/gateways/userRepository.go b/adapters/secondary/gateways/userRepository.go
index 691ed33..7f7c39c 100644
--- a/adapters/secondary/gateways/userRepository.go
+++ b/adapters/secondary/gateways/userRepository.go
@@ -45,13 +45,7 @@ func (u *UserRepository) Create(user domain.User) (domain.User, error) {
 	var createdUser entity.User
 	creationResult.Scan(&createdUser)
 
-	return domain.FromDb(
-			createdUser.ID,
-			createdUser.Username,
-			createdUser.Password,
-			createdUser.Email,
-			createdUser.CreatedAt,
-			createdUser.UpdatedAt),
+	return mapUserToDomain(createdUser),
 		nil
 }