diff --git a/Socialmetrica.package/NitterUser.class/instance/getMessages.st b/Socialmetrica.package/NitterUser.class/instance/getMessages.st
index 4f8a70d..d775842 100644
--- a/Socialmetrica.package/NitterUser.class/instance/getMessages.st
+++ b/Socialmetrica.package/NitterUser.class/instance/getMessages.st
@@ -19,5 +19,6 @@ getMessages
 		current queries add: customQuery.
 		lastTweets add: current.
 	].
-	^ lastTweets
+	self tweets: lastTweets.
+	^ self tweets
 	
\ No newline at end of file
diff --git a/Socialmetrica.package/Tweet.class/instance/reStoreDefinition.st b/Socialmetrica.package/Tweet.class/class/reStoreDefinition.st
similarity index 55%
rename from Socialmetrica.package/Tweet.class/instance/reStoreDefinition.st
rename to Socialmetrica.package/Tweet.class/class/reStoreDefinition.st
index 075db62..f2ce55c 100644
--- a/Socialmetrica.package/Tweet.class/instance/reStoreDefinition.st
+++ b/Socialmetrica.package/Tweet.class/class/reStoreDefinition.st
@@ -1,8 +1,9 @@
 accessing
 reStoreDefinition
 	^ super reStoreDefinition
-		define: #id as: String;
+		defineAsID: #id;
 		define: #text as: String;
 		define: #created as: String;
-		defineAsID: #id;
+		define: #user as: TwitterUser;
+		define: #timelines as: (Dictionary of: String -> String);  
 		yourself
\ No newline at end of file
diff --git a/Socialmetrica.package/Tweet.class/instance/timelines.st b/Socialmetrica.package/Tweet.class/instance/timelines.st
index ea24a75..e8623cd 100644
--- a/Socialmetrica.package/Tweet.class/instance/timelines.st
+++ b/Socialmetrica.package/Tweet.class/instance/timelines.st
@@ -2,4 +2,4 @@ accessing
 timelines
 	"A dictionary of several the timelines where this tweet appears.
 	The key is the user's timeline and the value is the message id before this particular message appears in such user's timeline."
-	^ self metadata at: 'timelines' ifAbsentPut: [ Dictionary new ].
\ No newline at end of file
+	^ timelines ifNil:  [ timelines  := Dictionary new ].
\ No newline at end of file
diff --git a/Socialmetrica.package/Tweet.class/properties.json b/Socialmetrica.package/Tweet.class/properties.json
index 9a69779..8b44959 100644
--- a/Socialmetrica.package/Tweet.class/properties.json
+++ b/Socialmetrica.package/Tweet.class/properties.json
@@ -13,7 +13,8 @@
 		"conversationId",
 		"user",
 		"metadata",
-		"metrics"
+		"metrics",
+		"timelines"
 	],
 	"name" : "Tweet",
 	"type" : "normal"
diff --git a/Socialmetrica.package/TwitterUser.class/class/reStoreDefinition.st b/Socialmetrica.package/TwitterUser.class/class/reStoreDefinition.st
new file mode 100644
index 0000000..0773c3f
--- /dev/null
+++ b/Socialmetrica.package/TwitterUser.class/class/reStoreDefinition.st
@@ -0,0 +1,7 @@
+accessing
+reStoreDefinition
+	^ super reStoreDefinition
+		define: #id as: String;
+		define: #userName as: String;
+		define: #profileImageUrl as: String;
+		yourself.
\ No newline at end of file