diff --git a/we_collector.py b/we_collector.py
index cd31f6b..264272e 100644
--- a/we_collector.py
+++ b/we_collector.py
@@ -31,11 +31,10 @@ class WeCollector:
 		self._wci = None
 		self._endpoint = None
 		self._record_list = None
-		self._date_last = None
-		self._file_timestamp = None
 		self._vehicle_data_last = None
 		self._f_mgr = FolderMgr()
 		self.create_session()
+		self._file_timestamp = None
 
 	def create_session(self):
 		expired_token_for_test = 'eyJraWQiOiI0ODEyODgzZi05Y2FiLTQwMWMtYTI5OC0wZmEyMTA5Y2ViY2EiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiIxMDQyNmRjZC1mYzljLTRkODctODBmYy0yMDIyNzdmYzhkYzIiLCJhdWQiOiJhMjRmYmE2My0zNGIzLTRkNDMtYjE4MS05NDIxMTFlNmJkYThAYXBwc192dy1kaWxhYl9jb20iLCJzY3AiOiJvcGVuaWQgcHJvZmlsZSBiYWRnZSBjYXJzIGRlYWxlcnMgdmluIiwiYWF0IjoiaWRlbnRpdHlraXQiLCJpc3MiOiJodHRwczovL2lkZW50aXR5LnZ3Z3JvdXAuaW8iLCJqdHQiOiJhY2Nlc3NfdG9rZW4iLCJleHAiOjE3Mjg5ODQzMjAsImlhdCI6MTcyODk4MDcyMCwibGVlIjpbIlZPTEtTV0FHRU4iXSwianRpIjoiYWQ0MDhkMDEtYmQxMy00YWZkLWIyMWEtYmZiMTE5NTFhOGE3In0.r78z00BS0Je7mjUcukmrkuSiPO9F8me-bLs3ZZF6BokhPX8uqu_2j7I3Pu-8C1xwFBb-YDs6rr0iiVUeOeiKM4O-jOik8ny57sMKdYJ_FHZNo-GLMA_WPppNaGWkM8HojIxEW4mrO3Zqd9f_vDrTAYukG4WyULbxq_OH6c6yQdmEx4M1PGisVB0DI6DG0Dl4748BCJMA_TyNvKagQHZuRhT0ma7kj_GVSqlGGtW0erwPBwTHY_X_wDitngod2iUw9nRtli-HkJKqgER82jSu2k5b36ePglsRqx6k4ls8Tiz6ykgcjuuW4_zdsfUNuhBElVd1QwCzolQ4e7IzHbVaRZbub8tlisrHZMskGJmNJeAUv9xZMJ8o6YNyAz__WPvP6iubrCIixSKOThv-YLXa0cFkCPmoaLR9eeTy6sWFsFvslTdD-a0zrrdP8ais4g5Cxao6ph3NV1xCgkEldImI3n1hxeMLefe6sqfoZ6Ogz-EDVPBxS9qpazPWN6EQyyYLXQZA0s6p5hcrjVq7pD-5yXjeFhCrymzizaNm0JhVF_L36F3D5a3s8tnQ2kaMfdK6jdHQyauxL-8SHfAgk_py33XOcgGQkp4aOXN3pm7UhutQ8fAS9kMoquqikuxTAu-UlWAYRhDUaypab1F51f50eK84s1jpgWDAQ1aL7PIgwj8'
@@ -56,20 +55,13 @@ class WeCollector:
 		self._endpoint = endpoint[:-1]
 		print(f'Endpoint: {self._endpoint}')
 
-	def init(self):
+	def init(self, file_timestamp):
 		self._record_id = 0
 		self._record_list = []
 		self._vehicle_data_last = {}
+		self._file_timestamp = file_timestamp
 
-	def request(self):
-		_date = get_date()
-		timestamp = create_timestamp()
-		# Reset on start up or day change
-		if date_has_changed(self._date_last, _date):
-			self._date_last = _date
-			self.init()
-			self._file_timestamp = create_timestamp(with_ms=False).replace(':', '-').replace('.', '-')
-
+	def request(self, _date, timestamp):
 		try:
 			print(f"{timestamp}: Retrieve vehicle data for {self._user['nickname']}")
 
@@ -96,12 +88,27 @@ class WeCollector:
 
 
 def request_loop(_wc_list: list[WeCollector]):
+	_date_last = None
+	_file_timestamp = None
+
 	while True:
 		start = time.time()
+		_date = get_date()
+		timestamp = create_timestamp()
+		# Reset on start up or day change
+		if date_has_changed(_date_last, _date):
+			_date_last = _date
+			_file_timestamp = create_timestamp(with_ms=False).replace(':', '-').replace('.', '-')
+
+			# Request service
+			for wc in wc_list:
+				wc.init(_file_timestamp)
 
 		# Request service
+		_date = get_date()
+		timestamp = create_timestamp()
 		for wc in wc_list:
-			wc.request()
+			wc.request(_date, timestamp)
 
 		# wait until next loop
 		stop = time.time()