diff --git a/Socialmetrica.package/NitterUser.class/instance/asDictionary.st b/Socialmetrica.package/NitterUser.class/instance/asDictionary.st
index 7a009d9..e4f537c 100644
--- a/Socialmetrica.package/NitterUser.class/instance/asDictionary.st
+++ b/Socialmetrica.package/NitterUser.class/instance/asDictionary.st
@@ -1,7 +1,7 @@
 accessing
 asDictionary
 
-	^ { 'profile-card-avatar' -> self profileImageFile values first fullName.
+	^ { 'profile-card-avatar' -> self profileImageFile fullName.
 	'profile-card-fullname' -> self name .
 	'profile-card-username' -> self userName .
 	'profile-bio' -> self profileBio } asDictionary
\ No newline at end of file
diff --git a/Socialmetrica.package/NitterUser.class/instance/collectRawTweetsUpToPage..st b/Socialmetrica.package/NitterUser.class/instance/collectRawTweetsUpToPage..st
index 373c686..9ab5715 100644
--- a/Socialmetrica.package/NitterUser.class/instance/collectRawTweetsUpToPage..st
+++ b/Socialmetrica.package/NitterUser.class/instance/collectRawTweetsUpToPage..st
@@ -3,7 +3,9 @@ collectRawTweetsUpToPage: anInteger
 
 	| pagesDict response customQuery |
 	pagesDict := self getPagesContentsUpto: anInteger.
-	response := TweetsCollection new.
+	response := TweetsCollection new
+		messages: OrderedCollection new;
+		yourself.
 	customQuery := Dictionary new
 		               at: 'parameters' put: pagesDict keys;
 		               at: 'date' put: DateAndTime now;
diff --git a/Socialmetrica.package/NitterUser.class/instance/profileImageFile.st b/Socialmetrica.package/NitterUser.class/instance/profileImageFile.st
index 01e8798..de10300 100644
--- a/Socialmetrica.package/NitterUser.class/instance/profileImageFile.st
+++ b/Socialmetrica.package/NitterUser.class/instance/profileImageFile.st
@@ -2,6 +2,6 @@ accessing
 profileImageFile
 	
 	| file |
-	file := (self folder / self userName, 'jpg'). 
+	file := (self folder / 'profile-image', 'jpg'). 
 	file exists ifTrue: [ ^ file ].
 	^ self downloadProfileImage
\ No newline at end of file
diff --git a/Socialmetrica.package/Tweet.class/instance/isInDB.st b/Socialmetrica.package/Tweet.class/instance/isInDB.st
new file mode 100644
index 0000000..62043f5
--- /dev/null
+++ b/Socialmetrica.package/Tweet.class/instance/isInDB.st
@@ -0,0 +1,6 @@
+accessing
+isInDB
+
+	(Tweet storedInstances select: [ :each | each id = self id ])
+		ifEmpty: [ ^ false ]
+		ifNotEmpty: [ ^ true ].
\ No newline at end of file