diff --git a/Socialmetrica.package/TweetsCollection.class/instance/store.st b/Socialmetrica.package/TweetsCollection.class/instance/store.st
index 4aa87d2..740ded3 100644
--- a/Socialmetrica.package/TweetsCollection.class/instance/store.st
+++ b/Socialmetrica.package/TweetsCollection.class/instance/store.st
@@ -1,9 +1,11 @@
 accessing
 store
-	| localFolder parameters |
+	| localFolder parameters host profile |
 	parameters := self queryParameters .
-	(parameters class = NitterUser or:  [ parameters class = TwitterUser ]) 
+	host :=  parameters asUrl host.
+	profile := parameters asUrl segments first.
+	host = NitterUser nitterProvider asUrl host 
 		ifFalse: [ ^ self ].
-	localFolder := (self dataStore / 'web' / 'twitter.com' / parameters userName) ensureCreateDirectory.
+	localFolder := (self dataStore / 'web' / 'twitter.com' / profile) ensureCreateDirectory.
 	 self tweets do: [:each | each exportInto: localFolder ].
 	 ^ localFolder
\ No newline at end of file