diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/User.java b/patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/User.java
index 86d3554f7e..8cd4fd0a00 100644
--- a/patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/User.java
+++ b/patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/User.java
@@ -1,7 +1,5 @@
 package com.baeldung.repositoryvsdaopattern;
 
-import java.util.List;
-
 public class User {
     
     private Long id;
@@ -10,8 +8,6 @@ public class User {
     private String lastName;
     private String email;
     
-    private List<Tweet> tweets;
-    
     public Long getId() {
         return id;
     }
@@ -51,13 +47,5 @@ public class User {
     public void setEmail(String email) {
         this.email = email;
     }
-
-    public List<Tweet> getTweets() {
-        return tweets;
-    }
-
-    public void setTweets(List<Tweet> tweets) {
-        this.tweets = tweets;
-    }
     
 }
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserRepositoryImpl.java b/patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserRepositoryImpl.java
index 6d7334c1ab..806b44e9d5 100644
--- a/patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserRepositoryImpl.java
+++ b/patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserRepositoryImpl.java
@@ -9,7 +9,7 @@ public class UserRepositoryImpl implements UserRepository {
     
     @Override
     public User get(Long id) {
-        User user = userDaoImpl.read(id);
+        UserSocialMedia user = (UserSocialMedia) userDaoImpl.read(id);
         
         List<Tweet> tweets = tweetDaoImpl.fetchTweets(user.getEmail());
         user.setTweets(tweets);
@@ -34,7 +34,8 @@ public class UserRepositoryImpl implements UserRepository {
 
     @Override
     public List<Tweet> fetchTweets(User user) {
-        return null;
+        return tweetDaoImpl.fetchTweets(user.getEmail());
+        
     }
     
     @Override
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserSocialMedia.java b/patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserSocialMedia.java
new file mode 100644
index 0000000000..bf729620af
--- /dev/null
+++ b/patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserSocialMedia.java
@@ -0,0 +1,17 @@
+package com.baeldung.repositoryvsdaopattern;
+
+import java.util.List;
+
+public class UserSocialMedia extends User {
+    
+    private List<Tweet> tweets;
+    
+    public List<Tweet> getTweets() {
+        return tweets;
+    }
+
+    public void setTweets(List<Tweet> tweets) {
+        this.tweets = tweets;
+    }
+
+}