diff --git a/app/benchmark/.gitignore b/app/benchmark/.gitignore
deleted file mode 100644
index 42afabfd..00000000
--- a/app/benchmark/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/app/benchmark/build.gradle b/app/benchmark/build.gradle
deleted file mode 100644
index feba5bdd..00000000
--- a/app/benchmark/build.gradle
+++ /dev/null
@@ -1,58 +0,0 @@
-plugins {
-    id 'com.android.test'
-    id 'org.jetbrains.kotlin.android'
-}
-
-android {
-    namespace 'illyan.jay.benchmark'
-    compileSdk 33
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
-    defaultConfig {
-        minSdk 23
-        targetSdk 33
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        // This benchmark buildType is used for benchmarking, and should function like your
-        // release build (for example, with minification on). It's signed with a debug key
-        // for easy local/CI testing.
-        benchmark {
-            debuggable false
-            minifyEnabled true
-            shrinkResources true
-            buildConfigField 'String', "MapboxAccessToken", "\"$MAPBOX_ACCESS_TOKEN\""
-            buildConfigField 'String', "MapboxDownloadsToken", "\"$MAPBOX_DOWNLOADS_TOKEN\""
-            buildConfigField 'String', "MapboxSdkRegistryToken", "\"$SDK_REGISTRY_TOKEN\""
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            signingConfig = debug.signingConfig
-            matchingFallbacks = ["release"]
-        }
-    }
-
-    targetProjectPath = ":app"
-    experimentalProperties["android.experimental.self-instrumenting"] = true
-}
-
-dependencies {
-    implementation 'androidx.test.ext:junit:1.1.5'
-    implementation 'androidx.test.espresso:espresso-core:3.5.1'
-    implementation 'androidx.test.uiautomator:uiautomator:2.2.0'
-    implementation 'androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha09'
-}
-
-androidComponents {
-    beforeVariants(selector().all()) {
-        enabled = buildType == "benchmark"
-    }
-}
\ No newline at end of file
diff --git a/app/benchmark/src/main/AndroidManifest.xml b/app/benchmark/src/main/AndroidManifest.xml
deleted file mode 100644
index 0b36bb5a..00000000
--- a/app/benchmark/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2023 Balázs Püspök-Kiss (Illyan)
-  ~
-  ~ Jay is a driver behaviour analytics app.
-  ~
-  ~ This file is part of Jay.
-  ~
-  ~ Jay is free software: you can redistribute it and/or modify it under the
-  ~ terms of the GNU General Public License as published by the Free Software
-  ~ Foundation, either version 3 of the License, or (at your option) any later version.
-  ~ Jay is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-  ~ A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along with Jay.
-  ~ If not, see <https://www.gnu.org/licenses/>.
-  -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-    <uses-sdk tools:overrideLibrary="androidx.benchmark.macro.junit4" />
-    <queries>
-        <package android:name="illyan.jay" />
-    </queries>
-</manifest>
\ No newline at end of file
diff --git a/app/benchmark/src/main/java/illyan/jay/benchmark/ExampleStartupBenchmark.kt b/app/benchmark/src/main/java/illyan/jay/benchmark/ExampleStartupBenchmark.kt
deleted file mode 100644
index f69077f7..00000000
--- a/app/benchmark/src/main/java/illyan/jay/benchmark/ExampleStartupBenchmark.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2023 Balázs Püspök-Kiss (Illyan)
- *
- * Jay is a driver behaviour analytics app.
- *
- * This file is part of Jay.
- *
- * Jay is free software: you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later version.
- * Jay is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Jay.
- * If not, see <https://www.gnu.org/licenses/>.
- */
-
-package illyan.jay.benchmark
-
-import androidx.benchmark.macro.StartupMode
-import androidx.benchmark.macro.StartupTimingMetric
-import androidx.benchmark.macro.junit4.MacrobenchmarkRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * This is an example startup benchmark.
- *
- * It navigates to the device's home screen, and launches the default activity.
- *
- * Before running this benchmark:
- * 1) switch your app's active build variant in the Studio (affects Studio runs only)
- * 2) add `<profileable android:shell="true" />` to your app's manifest, within the `<application>` tag
- *
- * Run this benchmark from Studio to see startup measurements, and captured system traces
- * for investigating your app's performance.
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleStartupBenchmark {
-    @get:Rule
-    val benchmarkRule = MacrobenchmarkRule()
-
-    @Test
-    fun startup() = benchmarkRule.measureRepeated(
-        packageName = "illyan.jay",
-        metrics = listOf(StartupTimingMetric()),
-        iterations = 5,
-        startupMode = StartupMode.COLD
-    ) {
-        pressHome()
-        startActivityAndWait()
-    }
-}
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 9320a97a..b8638030 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,7 +23,7 @@ plugins {
     id 'kotlin-kapt'
     id 'kotlin-android'
     id 'com.google.dagger.hilt.android'
-    id 'com.google.devtools.ksp' version '1.8.0-1.0.9' // Depends on your kotlin version
+    id 'com.google.devtools.ksp' version "$kotlin_version-1.0.11-SNAPSHOT" // Depends on your kotlin version
     id 'de.mannodermaus.android-junit5'
     id 'kotlin-parcelize'
     id 'org.jetbrains.kotlin.plugin.serialization'
@@ -40,8 +40,8 @@ android {
         applicationId "illyan.jay"
         minSdk 21
         targetSdk 33
-        versionCode 10
-        versionName "0.2.7-alpha"
+        versionCode 13
+        versionName "0.3.2-alpha"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -69,29 +69,36 @@ android {
             matchingFallbacks = ['release']
         }
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
         coreLibraryDesugaringEnabled true
     }
+
     kotlin {
         jvmToolchain(17)
     }
+
     buildFeatures {
         compose true
     }
+
     composeOptions {
-        kotlinCompilerExtensionVersion "1.4.0"
+        kotlinCompilerExtensionVersion "1.4.5"
     }
+
     packagingOptions {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
     }
+
     testOptions {
         unitTests.returnDefaultValues = true
         animationsDisabled = true
     }
+
     lint {
         // If set to true (default), stops the build if errors are found.
         // This is needed because CICD pipeline will flop without it.
@@ -101,17 +108,17 @@ android {
 
 dependencies {
     // Core
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.10'
-    implementation "androidx.core:core-ktx:1.9.0"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation 'androidx.core:core-ktx:1.10.0'
     implementation "androidx.collection:collection-ktx:1.2.0" // The Collection extensions contain utility functions for working with Android's memory-efficient collection libraries, including ArrayMap, LongSparseArray, LruCache, and others.
     implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation 'androidx.activity:activity-ktx:1.6.1'
+    implementation 'androidx.activity:activity-ktx:1.7.1'
     implementation "com.google.android.material:material:1.8.0"
     implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'], exclude: [])
 
     // Compose
-    def activity_version = '1.7.0-beta02'
-    def lifecycle_version = '2.6.0-rc01'
+    def activity_version = '1.7.0'
+    def lifecycle_version = '2.6.1'
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.material:material:$compose_version"
     implementation 'androidx.compose.material3:material3:1.1.0-alpha07'
@@ -119,7 +126,7 @@ dependencies {
     implementation "androidx.compose.ui:ui-util:$compose_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-process:lifecycle_version"
     implementation "androidx.activity:activity-compose:$activity_version"
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
     debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
@@ -128,7 +135,7 @@ dependencies {
     implementation "androidx.compose.foundation:foundation:$compose_version"
 
     // Baseline Profiles and benchmarking
-    implementation 'androidx.profileinstaller:profileinstaller:1.3.0-beta01'
+    implementation 'androidx.profileinstaller:profileinstaller:1.3.0'
 
     // Scrollbar
     implementation 'com.github.HLCaptain:compose-scrollbar:0.0.3-alpha'
@@ -148,9 +155,9 @@ dependencies {
     implementation "me.saket.swipe:swipe:1.1.1"
 
     // Mapbox
-    implementation "com.mapbox.maps:android:10.11.0-beta.1"
-    implementation "com.mapbox.search:mapbox-search-android-ui:1.0.0-beta.44"
-    implementation "com.mapbox.navigation:android:2.11.0-beta.1"
+    implementation "com.mapbox.maps:android:10.13.0-beta.1"
+    implementation "com.mapbox.search:mapbox-search-android-ui:1.0.0-rc.3"
+    implementation "com.mapbox.navigation:android:2.13.0-beta.1"
 
     // Accompanist
     def accompanist_version = '0.29.1-alpha'
@@ -159,7 +166,6 @@ dependencies {
     implementation "com.google.accompanist:accompanist-placeholder-material:$accompanist_version"
 
     // Hilt
-    def hilt_version = '2.44.2'
     implementation "com.google.dagger:hilt-android:$hilt_version"
     kapt "com.google.dagger:hilt-compiler:$hilt_version"
     implementation "androidx.hilt:hilt-navigation-compose:1.0.0"
@@ -173,18 +179,13 @@ dependencies {
     ksp "io.github.raamcosta.compose-destinations:ksp:$compose_nav_version"
 
     // Coil
-    implementation "io.coil-kt:coil-compose:2.2.2"
+    implementation 'io.coil-kt:coil-compose:2.3.0'
 
     // Room
-    def room_version = '2.5.0'
+    def room_version = '2.5.1'
     implementation "androidx.room:room-ktx:$room_version"
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
-    implementation "androidx.room:room-rxjava2:$room_version" // optional - RxJava2 support for Room
-    implementation "androidx.room:room-rxjava3:$room_version" // optional - RxJava3 support for Room
-    implementation "androidx.room:room-guava:$room_version" // optional - Guava support for Room, including Optional and ListenableFuture
-    testImplementation "androidx.room:room-testing:$room_version" // optional - Test helpers
-    implementation "androidx.room:room-paging:$room_version" // optional - Paging 3 Integration
 
     // Serialization
     implementation "androidx.datastore:datastore:1.0.0"
@@ -193,8 +194,8 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-serialization-protobuf:1.5.0'
 
     // Compression
-    implementation 'com.github.luben:zstd-jni:1.5.4-2@aar'
-    testImplementation "com.github.luben:zstd-jni:1.5.4-2"
+    implementation 'com.github.luben:zstd-jni:1.5.5-2@aar'
+    testImplementation 'com.github.luben:zstd-jni:1.5.5-2'
 
     // Coroutine
     def coroutines_version = '1.6.4'
@@ -204,13 +205,13 @@ dependencies {
 
     // Google services
     implementation 'com.google.android.gms:play-services-location:21.0.1'
-    implementation 'com.google.android.gms:play-services-auth:20.4.1'
-    implementation 'com.google.android.gms:play-services-ads:21.5.0'
-    implementation 'com.google.maps.android:android-maps-utils:2.4.0'
+    implementation 'com.google.android.gms:play-services-auth:20.5.0'
+    implementation 'com.google.android.gms:play-services-ads:22.0.0'
+    implementation 'com.google.maps.android:android-maps-utils:3.4.0'
     implementation 'com.google.maps.android:maps-utils-ktx:3.4.0'
 
     // Firebase
-    implementation platform('com.google.firebase:firebase-bom:31.0.3')
+    implementation platform('com.google.firebase:firebase-bom:31.5.0')
     implementation 'com.google.firebase:firebase-auth-ktx'
     implementation 'com.google.firebase:firebase-config-ktx'
     implementation 'com.google.firebase:firebase-analytics-ktx'
@@ -232,7 +233,7 @@ dependencies {
     // MockK test tool
     def mockk_version = '1.13.2'
     testImplementation "io.mockk:mockk:$mockk_version"
-    androidTestImplementation "io.mockk:mockk-android:$mockk_version"
+    androidTestImplementation "io.mockk:mockk-android:mockk_version"
 
     // Other testing tools
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
@@ -243,7 +244,7 @@ dependencies {
     androidTestImplementation 'androidx.test:rules:1.5.0'
 
     // Desugaring
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 }
 
 kapt {
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index cdc313f0..9b65471b 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -14,8 +14,18 @@
 
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
--keepattributes SourceFile,LineNumberTable
+-keepattributes SourceFile,LineNumberTable,Signature
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
+#-renamesourcefileattribute SourceFile
+
+# Keep custom model classes
+# TODO: remove this line when implemented Flows with Firestore
+-keep class illyan.jay.data.firestore.model.** { *; }
+
+# Needed for Kotlin suspend functions according to https://r8.googlesource.com/r8/+/refs/heads/master/compatibility-faq.md#kotlin-suspend-functions-and-generic-signatures
+-keep class kotlin.coroutines.Continuation
+
+# Needed for Firebase Auth to not crash when user signs in
+-keep class com.google.android.gms.internal.** { *; }
diff --git a/app/src/main/java/illyan/jay/MainApplication.kt b/app/src/main/java/illyan/jay/MainApplication.kt
index 76de7ebf..fa9eeaf7 100644
--- a/app/src/main/java/illyan/jay/MainApplication.kt
+++ b/app/src/main/java/illyan/jay/MainApplication.kt
@@ -25,16 +25,18 @@ import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.firebase.perf.FirebasePerformance
 import dagger.hilt.android.HiltAndroidApp
-import illyan.jay.data.disk.model.AppSettings
+import illyan.jay.data.datastore.model.AppSettings
 import illyan.jay.di.CoroutineScopeIO
 import illyan.jay.domain.interactor.AuthInteractor
 import illyan.jay.domain.interactor.SettingsInteractor
 import illyan.jay.util.log.CrashlyticsTree
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
+import kotlin.coroutines.cancellation.CancellationException
 
 @HiltAndroidApp
 class MainApplication : Application() {
@@ -48,6 +50,8 @@ class MainApplication : Application() {
     @Inject lateinit var settingsInteractor: SettingsInteractor
     @Inject @CoroutineScopeIO lateinit var coroutineScopeIO: CoroutineScope
 
+    private var logJob: Job? = null
+
     override fun onCreate() {
         super.onCreate()
 
@@ -64,25 +68,26 @@ class MainApplication : Application() {
             Timber.plant(debugTree)
             Timber.d("Planting debugTree")
         }
-        coroutineScopeIO.launch {
+        logJob?.cancel(CancellationException("Existing job to listen to preferences changes cancelled to avoid multiple threads listening to the same data"))
+        logJob = coroutineScopeIO.launch {
             settingsInteractor.userPreferences.collectLatest { preferences ->
                 preferences?.let {
                     crashlytics.setUserId(it.userUUID ?: "")
                     analytics.setUserId(it.userUUID)
                     val collectingData = Timber.forest().contains(crashlyticsTree)
                     if (it.analyticsEnabled && !collectingData) {
-                        Timber.d("Analytics On, Planting crashlyticsTree")
                         Timber.plant(crashlyticsTree)
+                        Timber.d("Analytics On, planted crashlyticsTree")
                         crashlytics.setCrashlyticsCollectionEnabled(true)
                         analytics.setAnalyticsCollectionEnabled(true)
                         performance.isPerformanceCollectionEnabled = !BuildConfig.DEBUG // Don't measure performance in DEBUG mode
                     } else if (!it.analyticsEnabled && collectingData) {
+                        Timber.d("Analytics Off, uprooting crashlyticsTree")
                         Timber.uproot(crashlyticsTree)
+                        crashlytics.sendUnsentReports()
                         crashlytics.setCrashlyticsCollectionEnabled(false)
                         analytics.setAnalyticsCollectionEnabled(false)
                         performance.isPerformanceCollectionEnabled = false
-                        crashlytics.deleteUnsentReports()
-                        Timber.d("Analytics Off, Uprooting crashlyticsTree")
                     }
                 }
             }
diff --git a/app/src/main/java/illyan/jay/data/disk/model/AppSettings.kt b/app/src/main/java/illyan/jay/data/datastore/model/AppSettings.kt
similarity index 75%
rename from app/src/main/java/illyan/jay/data/disk/model/AppSettings.kt
rename to app/src/main/java/illyan/jay/data/datastore/model/AppSettings.kt
index 13a6a40f..9b9a86e6 100644
--- a/app/src/main/java/illyan/jay/data/disk/model/AppSettings.kt
+++ b/app/src/main/java/illyan/jay/data/datastore/model/AppSettings.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Balázs Püspök-Kiss (Illyan)
+ * Copyright (c) 2023 Balázs Püspök-Kiss (Illyan)
  *
  * Jay is a driver behaviour analytics app.
  *
@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.disk.model
+package illyan.jay.data.datastore.model
 
 import illyan.jay.domain.model.DomainPreferences
 import kotlinx.serialization.Serializable
@@ -29,7 +29,4 @@ data class AppSettings(
     companion object {
         val default = AppSettings()
     }
-    // TODO: "Press this <button or screen> to support the project by giving me ad revenue"
-    //  in user preferences screen. This is an easy way to support the project besides
-    //  supporting it directly with donations.
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/illyan/jay/data/network/Mapping.kt b/app/src/main/java/illyan/jay/data/firestore/Mapping.kt
similarity index 94%
rename from app/src/main/java/illyan/jay/data/network/Mapping.kt
rename to app/src/main/java/illyan/jay/data/firestore/Mapping.kt
index 8c08b440..d50558b2 100644
--- a/app/src/main/java/illyan/jay/data/network/Mapping.kt
+++ b/app/src/main/java/illyan/jay/data/firestore/Mapping.kt
@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.network
+package illyan.jay.data.firestore
 
 import android.os.Parcel
 import android.os.Parcelable
@@ -26,12 +26,12 @@ import com.google.firebase.firestore.Blob
 import com.google.firebase.firestore.DocumentSnapshot
 import illyan.jay.BuildConfig
 import illyan.jay.data.DataStatus
-import illyan.jay.data.network.model.FirestoreLocation
-import illyan.jay.data.network.model.FirestorePath
-import illyan.jay.data.network.model.FirestoreSession
-import illyan.jay.data.network.model.FirestoreUser
-import illyan.jay.data.network.model.FirestoreUserPreferences
-import illyan.jay.data.network.serializers.TimestampSerializer
+import illyan.jay.data.firestore.model.FirestoreLocation
+import illyan.jay.data.firestore.model.FirestorePath
+import illyan.jay.data.firestore.model.FirestoreSession
+import illyan.jay.data.firestore.model.FirestoreUser
+import illyan.jay.data.firestore.model.FirestoreUserPreferences
+import illyan.jay.data.firestore.serializers.TimestampSerializer
 import illyan.jay.domain.model.DomainLocation
 import illyan.jay.domain.model.DomainPreferences
 import illyan.jay.domain.model.DomainSession
@@ -93,7 +93,8 @@ fun FirestoreUserPreferences.toDomainModel(
     freeDriveAutoStart = freeDriveAutoStart,
     showAds = showAds,
     lastUpdate = lastUpdate.toZonedDateTime(),
-    shouldSync = true
+    lastUpdateToAnalytics = lastUpdateToAnalytics?.toZonedDateTime(),
+    shouldSync = true,
 )
 
 fun DomainPreferences.toFirestoreModel() = FirestoreUserPreferences(
@@ -101,6 +102,7 @@ fun DomainPreferences.toFirestoreModel() = FirestoreUserPreferences(
     freeDriveAutoStart = freeDriveAutoStart,
     showAds = showAds,
     lastUpdate = lastUpdate.toTimestamp(),
+    lastUpdateToAnalytics = lastUpdateToAnalytics?.toTimestamp(),
 )
 
 @OptIn(ExperimentalSerializationApi::class)
@@ -352,15 +354,12 @@ fun List<DomainLocation>.toPaths(
 }
 
 @OptIn(ExperimentalSerializationApi::class)
-fun List<DocumentSnapshot>.toDomainLocations(): List<DomainLocation> {
+fun List<FirestorePath>.toDomainLocations(): List<DomainLocation> {
     val domainLocations = mutableListOf<DomainLocation>()
 
-    forEach { document ->
-        val sessionUUID = document.getString(FirestorePath.FieldSessionUUID) ?: ""
-        val locations = document.getBlob(FirestorePath.FieldLocations)?.toBytes()
-            ?.let { ProtoBuf.decodeFromByteArray<List<FirestoreLocation>>(Zstd.decompress(it, 1_000_000)) }
-            ?: emptyList()
-        domainLocations.addAll(locations.map { it.toDomainModel(sessionUUID) })
+    forEach { path ->
+        val locations = ProtoBuf.decodeFromByteArray<List<FirestoreLocation>>(Zstd.decompress(path.locations.toBytes(), 1_000_000))
+        domainLocations.addAll(locations.map { it.toDomainModel(path.sessionUUID) })
     }
 
     return domainLocations.sortedBy { it.zonedDateTime.toInstant().toEpochMilli() }
diff --git a/app/src/main/java/illyan/jay/data/firestore/datasource/FirestoreDataFlow.kt b/app/src/main/java/illyan/jay/data/firestore/datasource/FirestoreDataFlow.kt
new file mode 100644
index 00000000..a185fbce
--- /dev/null
+++ b/app/src/main/java/illyan/jay/data/firestore/datasource/FirestoreDataFlow.kt
@@ -0,0 +1,163 @@
+package illyan.jay.data.firestore.datasource
+
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.firestore.WriteBatch
+import illyan.jay.data.DataStatus
+import illyan.jay.util.runBatch
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import kotlin.coroutines.cancellation.CancellationException
+
+abstract class FirestoreDataFlow<FirestoreType, DomainType>(
+    private val firestore: FirebaseFirestore,
+    private val coroutineScopeIO: CoroutineScope,
+    private val toDomainModel: (FirestoreType?) -> DomainType?,
+    private val snapshotHandler: FirestoreSnapshotHandler<FirestoreType, out Any>,
+    private val appLifecycle: Lifecycle? = null,
+) : DefaultLifecycleObserver {
+
+    private val _dataListenerJob = MutableStateFlow<Job?>(null)
+    private val _dataStatus = MutableStateFlow(DataStatus<DomainType>())
+    private val _cloudDataStatus = MutableStateFlow(DataStatus<DomainType>())
+
+    val dataStatus: StateFlow<DataStatus<DomainType>> by lazy { _dataStatus.asStateFlow() }
+    val data = dataStatus.map { it.data }
+        .stateIn(coroutineScopeIO, SharingStarted.Eagerly, dataStatus.value.data)
+    val dataLoading = dataStatus.map { it.isLoading }
+        .stateIn(coroutineScopeIO, SharingStarted.Eagerly, dataStatus.value.isLoading)
+
+    val cloudDataStatus: StateFlow<DataStatus<DomainType>> by lazy { _cloudDataStatus.asStateFlow() }
+    val cloudData = cloudDataStatus.map { it.data }
+        .stateIn(coroutineScopeIO, SharingStarted.Eagerly, cloudDataStatus.value.data)
+    val cloudDataLoading = cloudDataStatus.map { it.isLoading }
+        .stateIn(coroutineScopeIO, SharingStarted.Eagerly, cloudDataStatus.value.isLoading)
+
+    init {
+        init()
+    }
+
+    fun init() {
+        appLifecycle?.addObserver(this)
+        resetDataListenerState()
+        refreshData()
+    }
+
+    private fun resetDataListenerState() {
+        Timber.v("Resetting data listener state")
+        _dataListenerJob.value?.cancel(CancellationException("Data listener reset requested, cancelling ongoing job"))
+        _dataListenerJob.update { null }
+        _dataStatus.update { DataStatus() }
+        _cloudDataStatus.update { DataStatus() }
+    }
+
+    override fun onStart(owner: LifecycleOwner) {
+        super.onStart(owner)
+        Timber.d("Reload data on App Lifecycle Start")
+        resetDataListenerState()
+        refreshData()
+    }
+
+    override fun onStop(owner: LifecycleOwner) {
+        super.onStop(owner)
+        Timber.d("Remove data listener on App Lifecycle Stop")
+        resetDataListenerState()
+    }
+
+    private fun refreshData() {
+        Timber.v("Refreshing data requested")
+        if (_cloudDataStatus.value.isLoading == true) {
+            Timber.d("Not refreshing data, due to another being loaded in or prerequisites are not met")
+            return
+        }
+        resetDataListenerState()
+        _dataStatus.update { it.copy(isLoading = true) }
+        _cloudDataStatus.update { it.copy(isLoading = true) }
+        _dataListenerJob.value?.cancel(CancellationException("Refreshing data, launching new job to handle updates, old job is cancelled"))
+        _dataListenerJob.update {
+            coroutineScopeIO.launch {
+                snapshotHandler.dataObjects().collectLatest { (data, metadata) ->
+                    Timber.v("New snapshot from ${if (metadata.isFromCache) "Cache" else "Cloud"}")
+                    processData(
+                        data = toDomainModel(data),
+                        isFromCache = metadata.isFromCache,
+                        updateCachedDataStatus = { status -> _dataStatus.update { status } },
+                        updateCloudDataStatus = { status -> _cloudDataStatus.update { status } },
+                    )
+                }
+            }
+        }
+    }
+
+    private fun processData(
+        data: DomainType?,
+        isFromCache: Boolean,
+        updateCachedDataStatus: (DataStatus<DomainType>) -> Unit,
+        updateCloudDataStatus: (DataStatus<DomainType>) -> Unit,
+    ) {
+        // Cache
+        if (data != null) {
+            if (_dataStatus.value.data != null) {
+                Timber.v("Refreshing Cached data")
+            } else {
+                Timber.d("Firestore loaded data from Cache")
+            }
+            updateCachedDataStatus(DataStatus(data = data, isLoading = false))
+        } else {
+            updateCachedDataStatus(DataStatus(data = null, isLoading = false))
+        }
+
+        // Cloud
+        if (!isFromCache) {
+            if (data != null) {
+                if (_cloudDataStatus.value.data != null) {
+                    Timber.v("Firestore loaded fresh data from Cloud")
+                } else {
+                    Timber.d("Firestore loaded data from Cloud")
+                }
+                updateCloudDataStatus(DataStatus(data = data, isLoading = false))
+            } else {
+                updateCloudDataStatus(DataStatus(data = null, isLoading = false))
+            }
+        }
+    }
+
+    suspend fun deleteData(
+        onCancel: () -> Unit = { Timber.i("User deletion canceled") },
+        onFailure: (Exception) -> Unit = { Timber.e(it) },
+        onSuccess: () -> Unit = { Timber.i("User deletion successful") },
+    ) {
+        firestore.runBatch(1) { batch, onOperationFinished ->
+            deleteData(
+                batch = batch,
+                onWriteFinished = onOperationFinished
+            )
+        }.addOnSuccessListener {
+            onSuccess()
+        }.addOnFailureListener {
+            onFailure(it)
+        }.addOnCanceledListener {
+            onCancel()
+        }
+    }
+
+    suspend fun deleteData(
+        batch: WriteBatch,
+        onWriteFinished: () -> Unit = {},
+    ) {
+        snapshotHandler.deleteReferences(batch)
+        onWriteFinished()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/illyan/jay/data/firestore/datasource/FirestoreDataSource.kt b/app/src/main/java/illyan/jay/data/firestore/datasource/FirestoreDataSource.kt
new file mode 100644
index 00000000..89518ce5
--- /dev/null
+++ b/app/src/main/java/illyan/jay/data/firestore/datasource/FirestoreDataSource.kt
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2023 Balázs Püspök-Kiss (Illyan)
+ *
+ * Jay is a driver behaviour analytics app.
+ *
+ * This file is part of Jay.
+ *
+ * Jay is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ * Jay is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Jay.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package illyan.jay.data.firestore.datasource
+
+import com.google.firebase.firestore.DocumentReference
+import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.firestore.WriteBatch
+import timber.log.Timber
+
+abstract class FirestoreDataSource<FirestoreType : Any>(
+    private val firestore: FirebaseFirestore
+) {
+
+    abstract fun getReference(data: FirestoreType): DocumentReference
+
+    fun setData(
+        data: FirestoreType,
+        onFailure: (Exception) -> Unit = { Timber.e(it, "Error while inserting data: ${it.message}") },
+        onCancel: () -> Unit = { Timber.i("Operation canceled") },
+        onSuccess: () -> Unit = { Timber.d("Successfully inserted data") }
+    ) = setData(
+        data = listOf(data),
+        onFailure = onFailure,
+        onCancel = onCancel,
+        onSuccess = onSuccess
+    )
+
+    fun setData(
+        data: List<FirestoreType>,
+        onFailure: (Exception) -> Unit = { Timber.e(it, "Error while inserting data: ${it.message}") },
+        onCancel: () -> Unit = { Timber.i("Operation canceled") },
+        onSuccess: () -> Unit = { Timber.d("Successfully inserted data") },
+    ) {
+        firestore.runBatch { batch ->
+            setData(data, batch)
+        }.addOnSuccessListener {
+            onSuccess()
+        }.addOnFailureListener { exception ->
+            onFailure(exception)
+        }.addOnCanceledListener {
+            onCancel()
+        }
+    }
+
+    fun setData(data: List<FirestoreType>, batch: WriteBatch) {
+        data.forEach { batch.set(getReference(it), it) }
+    }
+
+    fun deleteData(
+        data: FirestoreType,
+        onFailure: (Exception) -> Unit = { Timber.e(it, "Error while inserting data: ${it.message}") },
+        onCancel: () -> Unit = { Timber.i("Operation canceled") },
+        onSuccess: () -> Unit = { Timber.d("Successfully inserted data") }
+    ) = deleteData(
+        data = listOf(data),
+        onFailure = onFailure,
+        onCancel = onCancel,
+        onSuccess = onSuccess
+    )
+
+    fun deleteData(
+        data: List<FirestoreType>,
+        onFailure: (Exception) -> Unit = { Timber.e(it, "Error while inserting data: ${it.message}") },
+        onCancel: () -> Unit = { Timber.i("Operation canceled") },
+        onSuccess: () -> Unit = { Timber.d("Successfully inserted data") },
+    ) {
+        firestore.runBatch { batch ->
+            deleteData(data, batch)
+        }.addOnSuccessListener {
+            onSuccess()
+        }.addOnFailureListener { exception ->
+            onFailure(exception)
+        }.addOnCanceledListener {
+            onCancel()
+        }
+    }
+
+    fun deleteData(data: List<FirestoreType>, batch: WriteBatch) {
+        data.forEach { batch.delete(getReference(it)) }
+    }
+
+    fun modifyData(
+        data: FirestoreType,
+        onFailure: (Exception) -> Unit = { Timber.e(it, "Error while inserting data: ${it.message}") },
+        onCancel: () -> Unit = { Timber.i("Operation canceled") },
+        onSuccess: () -> Unit = { Timber.d("Successfully inserted data") },
+        modify: (batch: WriteBatch, data: FirestoreType, reference: DocumentReference) -> Unit
+    ) = modifyData(
+        data = listOf(data),
+        onFailure = onFailure,
+        onCancel = onCancel,
+        onSuccess = onSuccess,
+        modify = { batch, _ -> modify(batch, data, getReference(data)) }
+    )
+
+    fun modifyData(
+        data: List<FirestoreType>,
+        onFailure: (Exception) -> Unit = { Timber.e(it, "Error while inserting data: ${it.message}") },
+        onCancel: () -> Unit = { Timber.i("Operation canceled") },
+        onSuccess: () -> Unit = { Timber.d("Successfully inserted data") },
+        modify: (batch: WriteBatch, dataWithReference: List<Pair<FirestoreType, DocumentReference>>) -> Unit
+    ) {
+        firestore.runBatch { batch ->
+            modify(batch, data.map { it to getReference(it) })
+        }.addOnSuccessListener {
+            onSuccess()
+        }.addOnFailureListener { exception ->
+            onFailure(exception)
+        }.addOnCanceledListener {
+            onCancel()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/illyan/jay/data/firestore/datasource/FirestoreDocumentSnapshotHandler.kt b/app/src/main/java/illyan/jay/data/firestore/datasource/FirestoreDocumentSnapshotHandler.kt
new file mode 100644
index 00000000..37d9bcf2
--- /dev/null
+++ b/app/src/main/java/illyan/jay/data/firestore/datasource/FirestoreDocumentSnapshotHandler.kt
@@ -0,0 +1,36 @@
+package illyan.jay.data.firestore.datasource
+
+import com.google.firebase.firestore.DocumentReference
+import com.google.firebase.firestore.DocumentSnapshot
+import com.google.firebase.firestore.MetadataChanges
+import com.google.firebase.firestore.SnapshotMetadata
+import com.google.firebase.firestore.ktx.snapshots
+import illyan.jay.di.CoroutineScopeIO
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.flow.updateAndGet
+import kotlinx.coroutines.launch
+
+class FirestoreDocumentSnapshotHandler<DataType>(
+    private val snapshotToObject: (DocumentSnapshot) -> DataType?,
+    override val snapshotSourceFlow: Flow<Flow<DocumentSnapshot>?>,
+    private val initialReference: DocumentReference? = null,
+) : FirestoreSnapshotHandler<DataType, DocumentSnapshot>() {
+
+    init {
+        initialReference?.let { documentReferences.update { listOf(initialReference) } }
+    }
+
+    override fun toObject(snapshot: DocumentSnapshot): Pair<DataType?, SnapshotMetadata> {
+        return snapshotToObject(snapshot) to snapshot.metadata
+    }
+
+    override fun references(): Flow<List<DocumentReference>> {
+        return snapshots.map { snapshot ->
+            documentReferences.updateAndGet { listOf(snapshot.reference) }!!
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/illyan/jay/data/firestore/datasource/FirestoreQuerySnapshotHandler.kt b/app/src/main/java/illyan/jay/data/firestore/datasource/FirestoreQuerySnapshotHandler.kt
new file mode 100644
index 00000000..d7cb67a7
--- /dev/null
+++ b/app/src/main/java/illyan/jay/data/firestore/datasource/FirestoreQuerySnapshotHandler.kt
@@ -0,0 +1,24 @@
+package illyan.jay.data.firestore.datasource
+
+import com.google.firebase.firestore.DocumentReference
+import com.google.firebase.firestore.QuerySnapshot
+import com.google.firebase.firestore.SnapshotMetadata
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.updateAndGet
+
+class FirestoreQuerySnapshotHandler<DataType>(
+    private val snapshotToObject: (QuerySnapshot) -> DataType?,
+    override val snapshotSourceFlow: Flow<Flow<QuerySnapshot>?>,
+) : FirestoreSnapshotHandler<DataType, QuerySnapshot>() {
+
+    override fun toObject(snapshot: QuerySnapshot): Pair<DataType?, SnapshotMetadata> {
+        return snapshotToObject(snapshot) to snapshot.metadata
+    }
+
+    override fun references(): Flow<List<DocumentReference>> {
+        return snapshots.map { snapshot ->
+            documentReferences.updateAndGet { snapshot.documents.map { it.reference } }!!
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/illyan/jay/data/firestore/datasource/FirestoreSnapshotHandler.kt b/app/src/main/java/illyan/jay/data/firestore/datasource/FirestoreSnapshotHandler.kt
new file mode 100644
index 00000000..97479b6f
--- /dev/null
+++ b/app/src/main/java/illyan/jay/data/firestore/datasource/FirestoreSnapshotHandler.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2023 Balázs Püspök-Kiss (Illyan)
+ *
+ * Jay is a driver behaviour analytics app.
+ *
+ * This file is part of Jay.
+ *
+ * Jay is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ * Jay is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Jay.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package illyan.jay.data.firestore.datasource
+
+import com.google.firebase.firestore.DocumentReference
+import com.google.firebase.firestore.SnapshotMetadata
+import com.google.firebase.firestore.WriteBatch
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.channelFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+
+abstract class FirestoreSnapshotHandler<DataType, SnapshotType> {
+    abstract val snapshotSourceFlow: Flow<Flow<SnapshotType>?>
+
+    protected val documentReferences = MutableStateFlow<List<DocumentReference>?>(null)
+    val snapshots = channelFlow {
+        snapshotSourceFlow.collectLatest { snapshots ->
+            resetState()
+            snapshots?.let { launch { snapshots.collectLatest { channel.send(it) } } }
+        }
+    }
+
+    abstract fun toObject(snapshot: SnapshotType): Pair<DataType?, SnapshotMetadata>
+    abstract fun references(): Flow<List<DocumentReference>>
+
+    fun dataObjects(): Flow<Pair<DataType?, SnapshotMetadata>> {
+        return snapshots.map { toObject(it) }
+    }
+
+    suspend fun deleteReferences(batch: WriteBatch? = null) {
+        references().first { references ->
+            if (batch != null) {
+                references.forEach { batch.delete(it) }
+            } else {
+                references.forEach(DocumentReference::delete)
+            }
+            true
+        }
+    }
+
+    private fun resetState() {
+        documentReferences.update { null }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/illyan/jay/data/firestore/datasource/PathFirestoreDataSource.kt b/app/src/main/java/illyan/jay/data/firestore/datasource/PathFirestoreDataSource.kt
new file mode 100644
index 00000000..77a23f76
--- /dev/null
+++ b/app/src/main/java/illyan/jay/data/firestore/datasource/PathFirestoreDataSource.kt
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2023 Balázs Püspök-Kiss (Illyan)
+ *
+ * Jay is a driver behaviour analytics app.
+ *
+ * This file is part of Jay.
+ *
+ * Jay is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ * Jay is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Jay.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package illyan.jay.data.firestore.datasource
+
+import androidx.lifecycle.Lifecycle
+import com.google.firebase.firestore.DocumentReference
+import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.firestore.MetadataChanges
+import com.google.firebase.firestore.WriteBatch
+import com.google.firebase.firestore.ktx.snapshots
+import com.google.firebase.firestore.ktx.toObjects
+import com.google.maps.android.ktx.utils.sphericalPathLength
+import illyan.jay.data.firestore.model.FirestorePath
+import illyan.jay.data.firestore.toDomainLocations
+import illyan.jay.data.firestore.toPaths
+import illyan.jay.di.CoroutineScopeIO
+import illyan.jay.domain.interactor.AuthInteractor
+import illyan.jay.domain.model.DomainLocation
+import illyan.jay.domain.model.DomainSession
+import illyan.jay.util.awaitOperations
+import illyan.jay.util.delete
+import illyan.jay.util.runBatch
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.map
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class PathFirestoreDataSource @Inject constructor(
+    private val firestore: FirebaseFirestore,
+    private val authInteractor: AuthInteractor,
+    private val appLifecycle: Lifecycle,
+    private val userPathsDataFlowBuilder: () -> UserPathsFirestoreDataFlow,
+    @CoroutineScopeIO private val coroutineScopeIO: CoroutineScope,
+) : FirestoreDataSource<FirestorePath>(
+    firestore = firestore
+) {
+    override fun getReference(data: FirestorePath): DocumentReference {
+        return firestore
+            .collection(FirestorePath.CollectionName)
+            .document(data.uuid)
+    }
+
+    private val locationsByUser = lazy { userPathsDataFlowBuilder().data }
+
+    fun getLocationsBySession(sessionUUID: String) =
+        object : FirestoreDataFlow<List<FirestorePath>, List<DomainLocation>>(
+            firestore = firestore,
+            coroutineScopeIO = coroutineScopeIO,
+            toDomainModel = { it?.toDomainLocations() },
+            appLifecycle = appLifecycle,
+            snapshotHandler = FirestoreQuerySnapshotHandler(
+                snapshotToObject = { it.toObjects() },
+                snapshotSourceFlow = authInteractor.userUUIDStateFlow.map { uuid ->
+                    if (uuid != null) {
+                        firestore
+                            .collection(FirestorePath.CollectionName)
+                            .whereEqualTo(FirestorePath.FieldSessionUUID, sessionUUID)
+                            .snapshots(MetadataChanges.INCLUDE)
+                    } else {
+                        null
+                    }
+                }
+            )
+        ) {}.data
+
+    fun insertLocations(
+        domainSessions: List<DomainSession>,
+        domainLocations: List<DomainLocation>,
+        onFailure: (Exception) -> Unit = { Timber.e(it, "Error while inserting locations for ${domainSessions.size} sessions: ${it.message}") },
+        onCancel: () -> Unit = { Timber.i("Operation canceled") },
+        onSuccess: () -> Unit = { Timber.d("Successfully inserted locations for ${domainSessions.size} sessions") }
+    ) {
+        setData(
+            data = getPathsFromSessions(domainSessions, domainLocations),
+            onFailure = onFailure,
+            onCancel = onCancel,
+            onSuccess = onSuccess,
+        )
+    }
+
+    fun insertLocations(
+        domainSessions: List<DomainSession>,
+        domainLocations: List<DomainLocation>,
+        batch: WriteBatch,
+    ) {
+        setData(
+            data = getPathsFromSessions(domainSessions, domainLocations),
+            batch = batch,
+        )
+    }
+
+    private fun getPathsFromSessions(
+        domainSessions: List<DomainSession>,
+        domainLocations: List<DomainLocation>,
+    ): List<FirestorePath> {
+        val paths = mutableListOf<FirestorePath>()
+        domainSessions.forEach { session ->
+            val locationsForThisSession = domainLocations.filter { it.sessionUUID.contentEquals(session.uuid) }
+            if (session.distance == null) {
+                session.distance = locationsForThisSession
+                    .sortedBy { it.zonedDateTime.toInstant().toEpochMilli() }
+                    .map { it.latLng }.sphericalPathLength().toFloat()
+            }
+            paths.addAll(locationsForThisSession.toPaths(session.uuid, session.ownerUUID!!))
+        }
+        return paths
+    }
+
+    suspend fun deleteLocationsForUser(
+        userUUID: String = authInteractor.userUUID.toString(),
+        onDelete: () -> Unit = {}
+    ) {
+        firestore.runBatch(1) { batch, onOperationFinished ->
+            deleteLocationsForUser(
+                batch = batch,
+                userUUID = userUUID,
+                onWriteFinished = onOperationFinished
+            )
+        }.addOnSuccessListener { onDelete() }
+    }
+
+    suspend fun deleteLocationsForUser(
+        batch: WriteBatch,
+        userUUID: String = authInteractor.userUUID.toString(),
+        onWriteFinished: () -> Unit = {}
+    ) {
+        batch.delete(
+            query = firestore
+                .collection(FirestorePath.CollectionName)
+                .whereEqualTo(FirestorePath.FieldOwnerUUID, userUUID),
+            onOperationFinished = onWriteFinished
+        )
+    }
+
+    suspend fun deleteLocationsForSession(
+        sessionUUID: String,
+        onDelete: () -> Unit = {}
+    ) {
+        firestore.runBatch(1) { batch, onOperationFinished ->
+            deleteLocationsForSessions(
+                batch = batch,
+                sessionUUIDs = listOf(sessionUUID),
+                onWriteFinished = onOperationFinished
+            )
+        }.addOnSuccessListener { onDelete() }
+    }
+
+    suspend fun deleteLocationsForSessions(
+        sessionUUIDs: List<String>,
+        onDelete: () -> Unit = {}
+    ) {
+        firestore.runBatch(1) { batch, onOperationFinished ->
+            deleteLocationsForSessions(
+                batch = batch,
+                sessionUUIDs = sessionUUIDs,
+                onWriteFinished = onOperationFinished
+            )
+        }.addOnSuccessListener { onDelete() }
+    }
+
+    suspend fun deleteLocationsForSessions(
+        batch: WriteBatch,
+        sessionUUIDs: List<String>,
+        onWriteFinished: () -> Unit = {}
+    ) {
+        // [Query.whereIn] can only take in at most 10 objects to compare
+        val chunkedUUIDs = sessionUUIDs.chunked(10)
+        awaitOperations(chunkedUUIDs.size) { onOperationFinished ->
+            chunkedUUIDs.forEach { chunk ->
+                batch.delete(
+                    query = firestore
+                        .collection(FirestorePath.CollectionName)
+                        .whereIn(FirestorePath.FieldSessionUUID, chunk),
+                    onOperationFinished = onOperationFinished
+                )
+            }
+        }
+        onWriteFinished()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/illyan/jay/data/network/datasource/PreferencesNetworkDataSource.kt b/app/src/main/java/illyan/jay/data/firestore/datasource/PreferencesFirestoreDataSource.kt
similarity index 84%
rename from app/src/main/java/illyan/jay/data/network/datasource/PreferencesNetworkDataSource.kt
rename to app/src/main/java/illyan/jay/data/firestore/datasource/PreferencesFirestoreDataSource.kt
index d697fe15..65575365 100644
--- a/app/src/main/java/illyan/jay/data/network/datasource/PreferencesNetworkDataSource.kt
+++ b/app/src/main/java/illyan/jay/data/firestore/datasource/PreferencesFirestoreDataSource.kt
@@ -16,16 +16,16 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.network.datasource
+package illyan.jay.data.firestore.datasource
 
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.SetOptions
 import com.google.firebase.firestore.WriteBatch
 import illyan.jay.data.DataStatus
-import illyan.jay.data.network.model.FirestoreUser
-import illyan.jay.data.network.toDomainModel
-import illyan.jay.data.network.toDomainPreferencesStatus
-import illyan.jay.data.network.toFirestoreModel
+import illyan.jay.data.firestore.model.FirestoreUser
+import illyan.jay.data.firestore.toDomainModel
+import illyan.jay.data.firestore.toDomainPreferencesStatus
+import illyan.jay.data.firestore.toFirestoreModel
 import illyan.jay.di.CoroutineScopeIO
 import illyan.jay.domain.interactor.AuthInteractor
 import illyan.jay.domain.model.DomainPreferences
@@ -37,14 +37,14 @@ import kotlinx.coroutines.flow.stateIn
 import timber.log.Timber
 import javax.inject.Inject
 
-class PreferencesNetworkDataSource @Inject constructor(
+class PreferencesFirestoreDataSource @Inject constructor(
     private val firestore: FirebaseFirestore,
     private val authInteractor: AuthInteractor,
-    private val userNetworkDataSource: UserNetworkDataSource,
+    private val userFirestoreDataFlow: UserFirestoreDataFlow,
     @CoroutineScopeIO private val coroutineScopeIO: CoroutineScope
 ) {
     val preferences: StateFlow<DataStatus<DomainPreferences>> by lazy {
-        userNetworkDataSource.userStatus.map { userStatus ->
+        userFirestoreDataFlow.dataStatus.map { userStatus ->
             val status = resolvePreferencesFromStatus(userStatus)
             status.data?.let {
                 Timber.d("Firebase got preferences for user ${it.userUUID?.take(4)}")
@@ -53,12 +53,12 @@ class PreferencesNetworkDataSource @Inject constructor(
         }.stateIn(
             coroutineScopeIO,
             SharingStarted.Eagerly,
-            userNetworkDataSource.userStatus.value.toDomainPreferencesStatus()
+            userFirestoreDataFlow.dataStatus.value.toDomainPreferencesStatus()
         )
     }
 
     val cloudPreferencesStatus: StateFlow<DataStatus<DomainPreferences>> by lazy {
-        userNetworkDataSource.cloudUserStatus.map { userStatus ->
+        userFirestoreDataFlow.cloudDataStatus.map { userStatus ->
             val status = resolvePreferencesFromStatus(userStatus)
             status.data?.let {
                 Timber.d("Firebase got cloud preferences for user ${it.userUUID?.take(4)}")
@@ -67,7 +67,7 @@ class PreferencesNetworkDataSource @Inject constructor(
         }.stateIn(
             coroutineScopeIO,
             SharingStarted.Eagerly,
-            userNetworkDataSource.cloudUserStatus.value.toDomainPreferencesStatus()
+            userFirestoreDataFlow.cloudDataStatus.value.toDomainPreferencesStatus()
         )
     }
 
@@ -91,7 +91,11 @@ class PreferencesNetworkDataSource @Inject constructor(
         preferences: DomainPreferences,
         batch: WriteBatch,
     ) {
-        if (!authInteractor.isUserSignedIn) return
+        if (!authInteractor.isUserSignedIn) {
+            Timber.e("User not signed in, operation cancelled")
+            return
+        }
+        Timber.d("Set user preferences for user ${authInteractor.userUUID?.take(4)}")
         val userRef = firestore
             .collection(FirestoreUser.CollectionName)
             .document(authInteractor.userUUID!!)
diff --git a/app/src/main/java/illyan/jay/data/network/datasource/SessionNetworkDataSource.kt b/app/src/main/java/illyan/jay/data/firestore/datasource/SessionFirestoreDataSource.kt
similarity index 92%
rename from app/src/main/java/illyan/jay/data/network/datasource/SessionNetworkDataSource.kt
rename to app/src/main/java/illyan/jay/data/firestore/datasource/SessionFirestoreDataSource.kt
index f3accda3..8351f4a9 100644
--- a/app/src/main/java/illyan/jay/data/network/datasource/SessionNetworkDataSource.kt
+++ b/app/src/main/java/illyan/jay/data/firestore/datasource/SessionFirestoreDataSource.kt
@@ -16,17 +16,17 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.network.datasource
+package illyan.jay.data.firestore.datasource
 
 import com.google.firebase.firestore.FieldValue
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.SetOptions
 import com.google.firebase.firestore.WriteBatch
 import illyan.jay.data.DataStatus
-import illyan.jay.data.network.model.FirestoreUser
-import illyan.jay.data.network.toDomainModel
-import illyan.jay.data.network.toDomainSessionsStatus
-import illyan.jay.data.network.toFirestoreModel
+import illyan.jay.data.firestore.model.FirestoreUser
+import illyan.jay.data.firestore.toDomainModel
+import illyan.jay.data.firestore.toDomainSessionsStatus
+import illyan.jay.data.firestore.toFirestoreModel
 import illyan.jay.di.CoroutineScopeIO
 import illyan.jay.domain.interactor.AuthInteractor
 import illyan.jay.domain.model.DomainSession
@@ -42,28 +42,28 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class SessionNetworkDataSource @Inject constructor(
+class SessionFirestoreDataSource @Inject constructor(
     private val firestore: FirebaseFirestore,
     private val authInteractor: AuthInteractor,
-    private val userNetworkDataSource: UserNetworkDataSource,
+    private val userFirestoreDataFlow: UserFirestoreDataFlow,
     @CoroutineScopeIO private val coroutineScopeIO: CoroutineScope
 ) {
     val sessionsStatus: StateFlow<DataStatus<List<DomainSession>>> by lazy {
-        userNetworkDataSource.userStatus.map { userStatus ->
+        userFirestoreDataFlow.dataStatus.map { userStatus ->
             val status = resolveSessionsFromStatus(userStatus)
             status.data?.let { sessions ->
-                Timber.d("Firebase got sessions with IDs: ${sessions.map { it.uuid.take(4) }}")
+                Timber.d("Firebase cache got sessions with IDs: ${sessions.map { it.uuid.take(4) }}")
             }
             status
         }.stateIn(
             coroutineScopeIO,
             SharingStarted.Eagerly,
-            userNetworkDataSource.userStatus.value.toDomainSessionsStatus()
+            userFirestoreDataFlow.dataStatus.value.toDomainSessionsStatus()
         )
     }
 
     val cloudSessionsStatus: StateFlow<DataStatus<List<DomainSession>>> by lazy {
-        userNetworkDataSource.cloudUserStatus.map { userStatus ->
+        userFirestoreDataFlow.cloudDataStatus.map { userStatus ->
             val status = resolveSessionsFromStatus(userStatus)
             status.data?.let { sessions ->
                 Timber.d("Firebase got sessions with IDs: ${sessions.map { it.uuid.take(4) }}")
@@ -72,7 +72,7 @@ class SessionNetworkDataSource @Inject constructor(
         }.stateIn(
             coroutineScopeIO,
             SharingStarted.Eagerly,
-            userNetworkDataSource.cloudUserStatus.value.toDomainSessionsStatus()
+            userFirestoreDataFlow.cloudDataStatus.value.toDomainSessionsStatus()
         )
     }
 
@@ -153,7 +153,7 @@ class SessionNetworkDataSource @Inject constructor(
             return
         }
         coroutineScopeIO.launch {
-            userNetworkDataSource.user.first { user ->
+            userFirestoreDataFlow.data.first { user ->
                 user?.let {
                     val domainSessions = user.sessions.map { it.toDomainModel(userUUID) }
                     val sessionsToDelete = domainSessions.filter { sessionUUIDs.contains(it.uuid) }
diff --git a/app/src/main/java/illyan/jay/data/firestore/datasource/UserFirestoreDataFlow.kt b/app/src/main/java/illyan/jay/data/firestore/datasource/UserFirestoreDataFlow.kt
new file mode 100644
index 00000000..2d80241a
--- /dev/null
+++ b/app/src/main/java/illyan/jay/data/firestore/datasource/UserFirestoreDataFlow.kt
@@ -0,0 +1,25 @@
+package illyan.jay.data.firestore.datasource
+
+import androidx.lifecycle.Lifecycle
+import com.google.firebase.firestore.DocumentSnapshot
+import com.google.firebase.firestore.FirebaseFirestore
+import illyan.jay.data.firestore.model.FirestoreUser
+import illyan.jay.di.CoroutineScopeIO
+import illyan.jay.di.UserSnapshotHandler
+import kotlinx.coroutines.CoroutineScope
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class UserFirestoreDataFlow @Inject constructor(
+    firestore: FirebaseFirestore,
+    appLifecycle: Lifecycle,
+    @CoroutineScopeIO coroutineScopeIO: CoroutineScope,
+    @UserSnapshotHandler snapshotHandler: FirestoreSnapshotHandler<FirestoreUser, DocumentSnapshot>,
+) : FirestoreDataFlow<FirestoreUser, FirestoreUser>(
+    firestore = firestore,
+    appLifecycle = appLifecycle,
+    coroutineScopeIO = coroutineScopeIO,
+    toDomainModel = { it },
+    snapshotHandler = snapshotHandler,
+)
\ No newline at end of file
diff --git a/app/src/main/java/illyan/jay/data/firestore/datasource/UserPathsFirestoreDataFlow.kt b/app/src/main/java/illyan/jay/data/firestore/datasource/UserPathsFirestoreDataFlow.kt
new file mode 100644
index 00000000..79f71bf0
--- /dev/null
+++ b/app/src/main/java/illyan/jay/data/firestore/datasource/UserPathsFirestoreDataFlow.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2023 Balázs Püspök-Kiss (Illyan)
+ *
+ * Jay is a driver behaviour analytics app.
+ *
+ * This file is part of Jay.
+ *
+ * Jay is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ * Jay is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Jay.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package illyan.jay.data.firestore.datasource
+
+import androidx.lifecycle.Lifecycle
+import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.firestore.QuerySnapshot
+import illyan.jay.data.firestore.model.FirestorePath
+import illyan.jay.data.firestore.toDomainLocations
+import illyan.jay.di.UserPathsSnapshotHandler
+import illyan.jay.domain.model.DomainLocation
+import kotlinx.coroutines.CoroutineScope
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class UserPathsFirestoreDataFlow @Inject constructor(
+    firestore: FirebaseFirestore,
+    appLifecycle: Lifecycle,
+    coroutineScopeIO: CoroutineScope,
+    @UserPathsSnapshotHandler snapshotHandler: FirestoreSnapshotHandler<List<FirestorePath>, QuerySnapshot>,
+) : FirestoreDataFlow<List<FirestorePath>, List<List<DomainLocation>>>(
+    firestore = firestore,
+    appLifecycle = appLifecycle,
+    coroutineScopeIO = coroutineScopeIO,
+    toDomainModel = { paths ->
+        paths
+            ?.groupBy { it.sessionUUID }
+            ?.map { it.value.toDomainLocations() }
+    },
+    snapshotHandler = snapshotHandler,
+)
\ No newline at end of file
diff --git a/app/src/main/java/illyan/jay/data/network/model/FirestoreLocation.kt b/app/src/main/java/illyan/jay/data/firestore/model/FirestoreLocation.kt
similarity index 86%
rename from app/src/main/java/illyan/jay/data/network/model/FirestoreLocation.kt
rename to app/src/main/java/illyan/jay/data/firestore/model/FirestoreLocation.kt
index 55a6e1cc..e238d883 100644
--- a/app/src/main/java/illyan/jay/data/network/model/FirestoreLocation.kt
+++ b/app/src/main/java/illyan/jay/data/firestore/model/FirestoreLocation.kt
@@ -1,8 +1,8 @@
-package illyan.jay.data.network.model
+package illyan.jay.data.firestore.model
 
 import android.os.Parcelable
 import com.google.firebase.Timestamp
-import illyan.jay.data.network.serializers.TimestampSerializer
+import illyan.jay.data.firestore.serializers.TimestampSerializer
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
diff --git a/app/src/main/java/illyan/jay/data/network/model/FirestorePath.kt b/app/src/main/java/illyan/jay/data/firestore/model/FirestorePath.kt
similarity index 97%
rename from app/src/main/java/illyan/jay/data/network/model/FirestorePath.kt
rename to app/src/main/java/illyan/jay/data/firestore/model/FirestorePath.kt
index b8ea3daa..41edf4aa 100644
--- a/app/src/main/java/illyan/jay/data/network/model/FirestorePath.kt
+++ b/app/src/main/java/illyan/jay/data/firestore/model/FirestorePath.kt
@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.network.model
+package illyan.jay.data.firestore.model
 
 import com.google.firebase.firestore.Blob
 import com.google.firebase.firestore.DocumentId
diff --git a/app/src/main/java/illyan/jay/data/network/model/FirestoreSession.kt b/app/src/main/java/illyan/jay/data/firestore/model/FirestoreSession.kt
similarity index 98%
rename from app/src/main/java/illyan/jay/data/network/model/FirestoreSession.kt
rename to app/src/main/java/illyan/jay/data/firestore/model/FirestoreSession.kt
index 287b8ac2..6cf12f0f 100644
--- a/app/src/main/java/illyan/jay/data/network/model/FirestoreSession.kt
+++ b/app/src/main/java/illyan/jay/data/firestore/model/FirestoreSession.kt
@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.network.model
+package illyan.jay.data.firestore.model
 
 import com.google.firebase.Timestamp
 import com.google.firebase.firestore.GeoPoint
diff --git a/app/src/main/java/illyan/jay/data/network/model/FirestoreUser.kt b/app/src/main/java/illyan/jay/data/firestore/model/FirestoreUser.kt
similarity index 93%
rename from app/src/main/java/illyan/jay/data/network/model/FirestoreUser.kt
rename to app/src/main/java/illyan/jay/data/firestore/model/FirestoreUser.kt
index fb954398..686494e6 100644
--- a/app/src/main/java/illyan/jay/data/network/model/FirestoreUser.kt
+++ b/app/src/main/java/illyan/jay/data/firestore/model/FirestoreUser.kt
@@ -16,14 +16,13 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.network.model
+package illyan.jay.data.firestore.model
 
 import com.google.firebase.firestore.DocumentId
 import com.google.firebase.firestore.PropertyName
 
 data class FirestoreUser(
-    @DocumentId
-    val uuid: String = "",
+    @DocumentId val uuid: String = "",
     @PropertyName(FieldSessions) val sessions: List<FirestoreSession> = emptyList(),
     @PropertyName(FieldPreferences) val preferences: FirestoreUserPreferences? = null
 ) {
diff --git a/app/src/main/java/illyan/jay/data/network/model/FirestoreUserPreferences.kt b/app/src/main/java/illyan/jay/data/firestore/model/FirestoreUserPreferences.kt
similarity index 88%
rename from app/src/main/java/illyan/jay/data/network/model/FirestoreUserPreferences.kt
rename to app/src/main/java/illyan/jay/data/firestore/model/FirestoreUserPreferences.kt
index 8327597a..fd84841f 100644
--- a/app/src/main/java/illyan/jay/data/network/model/FirestoreUserPreferences.kt
+++ b/app/src/main/java/illyan/jay/data/firestore/model/FirestoreUserPreferences.kt
@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.network.model
+package illyan.jay.data.firestore.model
 
 import com.google.firebase.Timestamp
 import com.google.firebase.firestore.PropertyName
@@ -27,11 +27,13 @@ data class FirestoreUserPreferences(
     @PropertyName(FieldFreeDriveAutoStart) val freeDriveAutoStart: Boolean = DomainPreferences.Default.freeDriveAutoStart,
     @PropertyName(FieldShowAds) val showAds: Boolean = DomainPreferences.Default.showAds,
     @PropertyName(FieldLastUpdate) val lastUpdate: Timestamp = Timestamp.now(),
+    @PropertyName(FieldLastUpdateToAnalytics) val lastUpdateToAnalytics: Timestamp? = null,
 ) {
     companion object {
         const val FieldAnalyticsEnabled = "analyticsEnabled"
         const val FieldFreeDriveAutoStart = "freeDriveAutoStart"
         const val FieldLastUpdate = "lastUpdate"
         const val FieldShowAds = "showAds"
+        const val FieldLastUpdateToAnalytics = "lastUpdateToAnalytics"
     }
 }
diff --git a/app/src/main/java/illyan/jay/data/network/serializers/GeoPointParceler.kt b/app/src/main/java/illyan/jay/data/firestore/serializers/GeoPointParceler.kt
similarity index 96%
rename from app/src/main/java/illyan/jay/data/network/serializers/GeoPointParceler.kt
rename to app/src/main/java/illyan/jay/data/firestore/serializers/GeoPointParceler.kt
index 272a0770..125c77aa 100644
--- a/app/src/main/java/illyan/jay/data/network/serializers/GeoPointParceler.kt
+++ b/app/src/main/java/illyan/jay/data/firestore/serializers/GeoPointParceler.kt
@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.network.serializers
+package illyan.jay.data.firestore.serializers
 
 import android.os.Parcel
 import com.google.firebase.firestore.GeoPoint
diff --git a/app/src/main/java/illyan/jay/data/network/serializers/TimestampSerializer.kt b/app/src/main/java/illyan/jay/data/firestore/serializers/TimestampSerializer.kt
similarity index 97%
rename from app/src/main/java/illyan/jay/data/network/serializers/TimestampSerializer.kt
rename to app/src/main/java/illyan/jay/data/firestore/serializers/TimestampSerializer.kt
index fc63b6fc..4ea58e2a 100644
--- a/app/src/main/java/illyan/jay/data/network/serializers/TimestampSerializer.kt
+++ b/app/src/main/java/illyan/jay/data/firestore/serializers/TimestampSerializer.kt
@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.network.serializers
+package illyan.jay.data.firestore.serializers
 
 import com.google.firebase.Timestamp
 import kotlinx.serialization.KSerializer
diff --git a/app/src/main/java/illyan/jay/data/network/datasource/LocationNetworkDataSource.kt b/app/src/main/java/illyan/jay/data/network/datasource/LocationNetworkDataSource.kt
deleted file mode 100644
index 4738c51e..00000000
--- a/app/src/main/java/illyan/jay/data/network/datasource/LocationNetworkDataSource.kt
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright (c) 2022-2023 Balázs Püspök-Kiss (Illyan)
- *
- * Jay is a driver behaviour analytics app.
- *
- * This file is part of Jay.
- *
- * Jay is free software: you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later version.
- * Jay is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Jay.
- * If not, see <https://www.gnu.org/licenses/>.
- */
-
-package illyan.jay.data.network.datasource
-
-import com.google.firebase.firestore.FirebaseFirestore
-import com.google.firebase.firestore.WriteBatch
-import com.google.maps.android.ktx.utils.sphericalPathLength
-import illyan.jay.data.network.model.FirestorePath
-import illyan.jay.data.network.toDomainLocations
-import illyan.jay.data.network.toPaths
-import illyan.jay.di.CoroutineScopeIO
-import illyan.jay.domain.interactor.AuthInteractor
-import illyan.jay.domain.model.DomainLocation
-import illyan.jay.domain.model.DomainSession
-import illyan.jay.util.completeNext
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class LocationNetworkDataSource @Inject constructor(
-    private val firestore: FirebaseFirestore,
-    private val authInteractor: AuthInteractor,
-    @CoroutineScopeIO private val coroutineScopeIO: CoroutineScope
-) {
-    fun getLocations(
-        sessionUUID: String = authInteractor.userUUID.toString(),
-        listener: (List<DomainLocation>) -> Unit
-    ) {
-        if (authInteractor.isUserSignedIn) {
-            firestore
-                .collection(FirestorePath.CollectionName)
-                .whereEqualTo(FirestorePath.FieldSessionUUID, sessionUUID)
-                .addSnapshotListener { snapshot, error ->
-                    if (error != null) {
-                        Timber.e(error, "Error while getting path for session $sessionUUID: ${error.message}")
-                    } else {
-                        listener(snapshot!!.documents.toDomainLocations())
-                    }
-                }
-        } else {
-            listener(emptyList())
-        }
-    }
-
-    fun insertLocations(
-        domainSessions: List<DomainSession>,
-        domainLocations: List<DomainLocation>,
-        onFailure: (Exception) -> Unit = { Timber.e(it, "Error while inserting locations for ${domainSessions.size} sessions: ${it.message}") },
-        onCancel: () -> Unit = { Timber.i("Operation canceled") },
-        onSuccess: () -> Unit = { Timber.d("Successfully inserted locations for ${domainSessions.size} sessions") }
-    ) {
-        insertPaths(
-            paths = getPathsFromSessions(domainSessions, domainLocations),
-            onFailure = onFailure,
-            onCancel = onCancel,
-            onSuccess = onSuccess,
-        )
-    }
-
-    fun insertLocations(
-        domainSessions: List<DomainSession>,
-        domainLocations: List<DomainLocation>,
-        batch: WriteBatch,
-    ) {
-        insertPaths(
-            paths = getPathsFromSessions(domainSessions, domainLocations),
-            batch = batch,
-        )
-    }
-
-    private fun getPathsFromSessions(
-        domainSessions: List<DomainSession>,
-        domainLocations: List<DomainLocation>,
-    ): List<FirestorePath> {
-        val paths = mutableListOf<FirestorePath>()
-        domainSessions.forEach { session ->
-            val locationsForThisSession = domainLocations.filter { it.sessionUUID.contentEquals(session.uuid) }
-            if (session.distance == null) {
-                session.distance = locationsForThisSession
-                    .sortedBy { it.zonedDateTime.toInstant().toEpochMilli() }
-                    .map { it.latLng }.sphericalPathLength().toFloat()
-            }
-            paths.addAll(locationsForThisSession.toPaths(session.uuid, session.ownerUUID!!))
-        }
-        return paths
-    }
-
-    fun insertPath(
-        path: FirestorePath,
-        onFailure: (Exception) -> Unit = { Timber.e(it, "Error while inserting path ${path.uuid.take(4)} for session ${path.sessionUUID.take(4)}: ${it.message}") },
-        onCancel: () -> Unit = { Timber.i("Operation canceled") },
-        onSuccess: () -> Unit = { Timber.d("Successfully inserted path ${path.uuid.take(4)}") }
-    ) = insertPaths(
-        paths = listOf(path),
-        onFailure = onFailure,
-        onCancel = onCancel,
-        onSuccess = onSuccess
-    )
-
-    fun insertPaths(
-        paths: List<FirestorePath>,
-        onFailure: (Exception) -> Unit = { Timber.e(it, "Error while inserting paths: ${it.message}") },
-        onCancel: () -> Unit = { Timber.i("Operation canceled") },
-        onSuccess: () -> Unit = { Timber.d("Successfully inserted ${paths.size} paths") },
-    ) {
-        if (!authInteractor.isUserSignedIn || paths.isEmpty()) return
-        firestore.runBatch { batch ->
-            insertPaths(paths, batch)
-        }.addOnSuccessListener {
-            onSuccess()
-        }.addOnFailureListener { exception ->
-            onFailure(exception)
-        }.addOnCanceledListener {
-            onCancel()
-        }
-    }
-
-    fun insertPaths(
-        paths: List<FirestorePath>,
-        batch: WriteBatch,
-    ) {
-        if (!authInteractor.isUserSignedIn || paths.isEmpty()) return
-        val pathRefs = paths.map {
-            firestore
-                .collection(FirestorePath.CollectionName)
-                .document(it.uuid) to it
-        }
-        pathRefs.forEach {
-            batch.set(it.first, it.second)
-        }
-    }
-
-    suspend fun deleteLocationsForUser(
-        userUUID: String = authInteractor.userUUID.toString(),
-        onDelete: () -> Unit = {}
-    ) {
-        val batch = firestore.batch()
-        deleteLocationsForUser(
-            batch = batch,
-            userUUID = userUUID,
-            onWriteFinished = {
-                batch.commit()
-                onDelete()
-            }
-        )
-    }
-
-    suspend fun deleteLocationsForUser(
-        batch: WriteBatch,
-        userUUID: String = authInteractor.userUUID.toString(),
-        onWriteFinished: () -> Unit = {}
-    ) {
-        if (!authInteractor.isUserSignedIn) return
-        val completableDeferred = CompletableDeferred<Unit>()
-        Timber.v("Adding snapshot listener to delete Sessions with ${userUUID.take(4)} as Owner")
-        val pathSnapshotListener = firestore
-            .collection(FirestorePath.CollectionName)
-            .whereEqualTo(FirestorePath.FieldOwnerUUID, userUUID)
-            .addSnapshotListener { pathSnapshot, pathError ->
-                if (pathError != null) {
-                    Timber.e(pathError, "Error while deleting user data: ${pathError.message}")
-                } else {
-                    Timber.d("Batch delete ${pathSnapshot!!.documents.size} path data for user ${userUUID.take(4)}")
-                    pathSnapshot.documents.forEach {
-                        batch.delete(it.reference)
-                    }
-                    onWriteFinished()
-                    completableDeferred.complete(Unit)
-                }
-            }
-        completableDeferred.await()
-        Timber.v("Removing snapshot listener from Firestore")
-        pathSnapshotListener.remove()
-    }
-
-    suspend fun deleteLocationsForSession(
-        sessionUUID: String,
-        onDelete: () -> Unit = {}
-    ) {
-        val batch = firestore.batch()
-        deleteLocationsForSessions(
-            batch = batch,
-            sessionUUIDs = listOf(sessionUUID),
-            onWriteFinished = {
-                batch.commit()
-                onDelete()
-            }
-        )
-    }
-
-    suspend fun deleteLocationsForSessions(
-        sessionUUIDs: List<String>,
-        onDelete: () -> Unit = {}
-    ) {
-        val batch = firestore.batch()
-        deleteLocationsForSessions(
-            batch = batch,
-            sessionUUIDs = sessionUUIDs,
-            onWriteFinished = {
-                batch.commit()
-                onDelete()
-            }
-        )
-    }
-
-    suspend fun deleteLocationsForSessions(
-        batch: WriteBatch,
-        sessionUUIDs: List<String>,
-        onWriteFinished: () -> Unit = {}
-    ) {
-        if (sessionUUIDs.isEmpty()) {
-            Timber.d("No sessions given to delete paths for")
-            return
-        }
-        // [Query.whereIn] can only take in at most 10 objects to compare
-        sessionUUIDs.chunked(10).forEach { chunk ->
-            val completableDeferred = CompletableDeferred<Unit>()
-            Timber.v("Adding snapshot listener to batch delete ${chunk.size} path data")
-            val pathSnapshotListener = firestore
-                .collection(FirestorePath.CollectionName)
-                .whereIn(FirestorePath.FieldSessionUUID, chunk)
-                .addSnapshotListener { pathSnapshot, pathError ->
-                    if (pathError != null) {
-                        Timber.e(pathError, "Error while deleting path data: ${pathError.message}")
-                    } else {
-                        Timber.d("Batch delete ${pathSnapshot!!.documents.size} path data for user ${authInteractor.userUUID?.take(4)}")
-                        pathSnapshot.documents.forEach {
-                            batch.delete(it.reference)
-                        }
-                        completableDeferred.complete(Unit)
-                        onWriteFinished()
-                    }
-                }
-            completableDeferred.await()
-            Timber.v("Removing snapshot listener from Firestore")
-            pathSnapshotListener.remove()
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/illyan/jay/data/network/datasource/UserNetworkDataSource.kt b/app/src/main/java/illyan/jay/data/network/datasource/UserNetworkDataSource.kt
deleted file mode 100644
index 305e3f87..00000000
--- a/app/src/main/java/illyan/jay/data/network/datasource/UserNetworkDataSource.kt
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (c) 2023 Balázs Püspök-Kiss (Illyan)
- *
- * Jay is a driver behaviour analytics app.
- *
- * This file is part of Jay.
- *
- * Jay is free software: you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later version.
- * Jay is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Jay.
- * If not, see <https://www.gnu.org/licenses/>.
- */
-
-package illyan.jay.data.network.datasource
-
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import com.google.firebase.firestore.DocumentSnapshot
-import com.google.firebase.firestore.EventListener
-import com.google.firebase.firestore.FirebaseFirestore
-import com.google.firebase.firestore.ListenerRegistration
-import com.google.firebase.firestore.MetadataChanges
-import com.google.firebase.firestore.WriteBatch
-import com.google.firebase.firestore.ktx.toObject
-import illyan.jay.data.DataStatus
-import illyan.jay.data.network.model.FirestoreUser
-import illyan.jay.di.CoroutineScopeIO
-import illyan.jay.domain.interactor.AuthInteractor
-import illyan.jay.util.runBatch
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.flow.update
-import timber.log.Timber
-import java.util.concurrent.Executors
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class UserNetworkDataSource @Inject constructor(
-    private val firestore: FirebaseFirestore,
-    private val authInteractor: AuthInteractor,
-    private val appLifecycle: Lifecycle,
-    @CoroutineScopeIO private val coroutineScopeIO: CoroutineScope
-) : DefaultLifecycleObserver {
-    private val executor = Executors.newSingleThreadExecutor()
-
-    private val _userListenerRegistration = MutableStateFlow<ListenerRegistration?>(null)
-    private val _userReference = MutableStateFlow<DocumentSnapshot?>(null)
-    private val _userStatus = MutableStateFlow(DataStatus<FirestoreUser>())
-    private val _cloudUserStatus = MutableStateFlow(DataStatus<FirestoreUser>())
-
-    val userStatus: StateFlow<DataStatus<FirestoreUser>> by lazy {
-        if (_userListenerRegistration.value == null && _userStatus.value.isLoading != true) {
-            Timber.d("User StateFlow requested, but listener registration is null, reloading it")
-            refreshUser()
-        }
-        _userStatus.asStateFlow()
-    }
-
-    val user = userStatus.map {
-        it.data
-    }.stateIn(coroutineScopeIO, SharingStarted.Eagerly, userStatus.value.data)
-
-    val cloudUserStatus: StateFlow<DataStatus<FirestoreUser>> by lazy {
-        if (_userListenerRegistration.value == null && _cloudUserStatus.value.isLoading != true) {
-            Timber.d("User StateFlow requested, but listener registration is null, reloading it")
-            refreshUser()
-        }
-        _cloudUserStatus.asStateFlow()
-    }
-
-    val cloudUser = cloudUserStatus.map {
-        it.data
-    }.stateIn(coroutineScopeIO, SharingStarted.Eagerly, cloudUserStatus.value.data)
-
-    init {
-        authInteractor.addAuthStateListener { state ->
-            if (authInteractor.isUserSignedIn) {
-                if (authInteractor.userUUID != null &&
-                    authInteractor.userUUID != _userStatus.value.data?.uuid
-                ) {
-                    Timber.d("Reloading snapshot listener for user ${state.currentUser?.uid?.take(4)}")
-                    resetUserListenerData()
-                    refreshUser()
-                } else {
-                    Timber.d("User not changed from ${_userStatus.value.data?.uuid?.take(4)}, not reloading snapshot listener on auth state change")
-                }
-            } else {
-                Timber.d("Removing snapshot listener for user ${_userStatus.value.data?.uuid?.take(4)}")
-                resetUserListenerData()
-            }
-        }
-        appLifecycle.addObserver(this)
-    }
-
-    private fun resetUserListenerData() {
-        Timber.v("Resetting user listener state")
-        _userListenerRegistration.value?.remove()
-        if (_userListenerRegistration.value != null) _userListenerRegistration.update { null }
-        if (_userReference.value != null) _userReference.update { null }
-        _userStatus.update { DataStatus() }
-        _cloudUserStatus.update { DataStatus() }
-    }
-
-    override fun onStart(owner: LifecycleOwner) {
-        super.onStart(owner)
-        Timber.d("Reload user on App Lifecycle Start")
-        resetUserListenerData()
-        refreshUser()
-    }
-
-    override fun onStop(owner: LifecycleOwner) {
-        super.onStop(owner)
-        Timber.d("Remove user listener on App Lifecycle Stop")
-        resetUserListenerData()
-    }
-
-    private fun refreshUser(
-        userUUID: String = authInteractor.userUUID.toString(),
-        onError: (Exception) -> Unit = { Timber.e(it, "Error while getting user data: ${it.message}") },
-        onSuccess: (FirestoreUser?) -> Unit = {},
-    ) {
-        Timber.v("Refreshing user ${userUUID.take(4)} requested")
-        if (!authInteractor.isUserSignedIn || _cloudUserStatus.value.isLoading == true) {
-            Timber.d("Not refreshing user, due to another being loaded in or user is not signed in")
-            return
-        }
-        resetUserListenerData()
-        _userStatus.update { it.copy(isLoading = true) }
-        _cloudUserStatus.update { it.copy(isLoading = true) }
-        Timber.d("Connecting snapshot listener to Firebase to get ${userUUID.take(4)} user's data")
-        val snapshotListener = EventListener<DocumentSnapshot> { snapshot, error ->
-            Timber.v("New snapshot regarding user ${userUUID.take(4)}")
-            if (error != null) {
-                onError(error)
-            } else {
-                val user = snapshot?.toObject<FirestoreUser>()
-                onSuccess(user)
-                if (snapshot != null) {
-                    // Update _userReference value with snapshot when snapshot is not null
-                    _userReference.update { snapshot }
-                } else if (_userReference.value != null) {
-                    // If snapshot is null, then _userReference is invalid if not null. Assign null to it.
-                    _userReference.update { null }
-                }
-
-                // Cache
-                if (user != null) {
-                    if (_userStatus.value.data != null) {
-                        Timber.v("Refreshing Cached ${userUUID.take(4)} user's data")
-                    } else {
-                        Timber.d("Firestore loaded ${userUUID.take(4)} user's data from Cache")
-                    }
-                    _userStatus.update { DataStatus(data = user, isLoading = false) }
-                } else {
-                    _userStatus.update { DataStatus(data = null, isLoading = false) }
-                }
-
-                // Cloud
-                if (snapshot?.metadata?.isFromCache == false) {
-                    if (user != null) {
-                        if (_cloudUserStatus.value.data != null) {
-                            Timber.v("Firestore loaded fresh ${userUUID.take(4)} user's data from Cloud")
-                        } else {
-                            Timber.d("Firestore loaded ${userUUID.take(4)} user's data from Cloud")
-                        }
-                        _cloudUserStatus.update { DataStatus(data = user, isLoading = false) }
-                    } else {
-                        _cloudUserStatus.update { DataStatus(data = null, isLoading = false) }
-                    }
-                }
-            }
-        }
-        _userListenerRegistration.value = firestore
-            .collection(FirestoreUser.CollectionName)
-            .document(userUUID)
-            .addSnapshotListener(executor, MetadataChanges.INCLUDE, snapshotListener)
-    }
-
-    suspend fun deleteUserData(
-        onCancel: () -> Unit = { Timber.i("User data deletion canceled") },
-        onFailure: (Exception) -> Unit = { Timber.e(it) },
-        onSuccess: () -> Unit = { Timber.i("User data deletion successful") },
-    ) {
-        firestore.runBatch(1) { batch, onOperationFinished ->
-            deleteUserData(
-                batch = batch,
-                onWriteFinished = onOperationFinished
-            )
-        }.addOnSuccessListener {
-            onSuccess()
-        }.addOnFailureListener {
-            onFailure(it)
-        }.addOnCanceledListener {
-            onCancel()
-        }
-    }
-
-    suspend fun deleteUserData(
-        batch: WriteBatch,
-        onWriteFinished: () -> Unit = {}
-    ) {
-        _userReference.first { snapshot ->
-            snapshot?.let {
-                batch.delete(it.reference)
-                onWriteFinished()
-            }
-            true
-        }
-    }
-}
diff --git a/app/src/main/java/illyan/jay/data/disk/JayDatabase.kt b/app/src/main/java/illyan/jay/data/room/JayDatabase.kt
similarity index 81%
rename from app/src/main/java/illyan/jay/data/disk/JayDatabase.kt
rename to app/src/main/java/illyan/jay/data/room/JayDatabase.kt
index 79ea9c22..2f3d30cc 100644
--- a/app/src/main/java/illyan/jay/data/disk/JayDatabase.kt
+++ b/app/src/main/java/illyan/jay/data/room/JayDatabase.kt
@@ -16,18 +16,18 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.disk
+package illyan.jay.data.room
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
-import illyan.jay.data.disk.dao.LocationDao
-import illyan.jay.data.disk.dao.PreferencesDao
-import illyan.jay.data.disk.dao.SensorEventDao
-import illyan.jay.data.disk.dao.SessionDao
-import illyan.jay.data.disk.model.RoomLocation
-import illyan.jay.data.disk.model.RoomPreferences
-import illyan.jay.data.disk.model.RoomSensorEvent
-import illyan.jay.data.disk.model.RoomSession
+import illyan.jay.data.room.dao.LocationDao
+import illyan.jay.data.room.dao.PreferencesDao
+import illyan.jay.data.room.dao.SensorEventDao
+import illyan.jay.data.room.dao.SessionDao
+import illyan.jay.data.room.model.RoomLocation
+import illyan.jay.data.room.model.RoomPreferences
+import illyan.jay.data.room.model.RoomSensorEvent
+import illyan.jay.data.room.model.RoomSession
 
 /**
  * Jay abstract database class annotated for generated code
@@ -42,7 +42,7 @@ import illyan.jay.data.disk.model.RoomSession
         RoomSensorEvent::class,
         RoomPreferences::class,
     ],
-    version = 32,
+    version = 33,
     exportSchema = false
 )
 abstract class JayDatabase : RoomDatabase() {
diff --git a/app/src/main/java/illyan/jay/data/disk/Mapping.kt b/app/src/main/java/illyan/jay/data/room/Mapping.kt
similarity index 92%
rename from app/src/main/java/illyan/jay/data/disk/Mapping.kt
rename to app/src/main/java/illyan/jay/data/room/Mapping.kt
index e3bb2621..a2d1d7c2 100644
--- a/app/src/main/java/illyan/jay/data/disk/Mapping.kt
+++ b/app/src/main/java/illyan/jay/data/room/Mapping.kt
@@ -16,16 +16,16 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.disk
+package illyan.jay.data.room
 
 import android.hardware.SensorEvent
 import android.location.Location
 import android.os.Build.VERSION
 import android.os.Build.VERSION_CODES
-import illyan.jay.data.disk.model.RoomLocation
-import illyan.jay.data.disk.model.RoomPreferences
-import illyan.jay.data.disk.model.RoomSensorEvent
-import illyan.jay.data.disk.model.RoomSession
+import illyan.jay.data.room.model.RoomLocation
+import illyan.jay.data.room.model.RoomPreferences
+import illyan.jay.data.room.model.RoomSensorEvent
+import illyan.jay.data.room.model.RoomSession
 import illyan.jay.domain.model.DomainLocation
 import illyan.jay.domain.model.DomainPreferences
 import illyan.jay.domain.model.DomainSensorEvent
@@ -158,7 +158,8 @@ fun RoomPreferences.toDomainModel() = DomainPreferences(
     freeDriveAutoStart = freeDriveAutoStart,
     showAds = showAds,
     lastUpdate = Instant.ofEpochMilli(lastUpdate).toZonedDateTime(),
-    shouldSync = shouldSync
+    lastUpdateToAnalytics = lastUpdateToAnalytics?.let { return@let Instant.ofEpochMilli(it).toZonedDateTime() },
+    shouldSync = shouldSync,
 )
 
 fun DomainPreferences.toRoomModel(
@@ -170,5 +171,6 @@ fun DomainPreferences.toRoomModel(
     freeDriveAutoStart = freeDriveAutoStart,
     showAds = showAds,
     lastUpdate = lastUpdate.toInstant().toEpochMilli(),
-    shouldSync = shouldSync
+    lastUpdateToAnalytics = lastUpdateToAnalytics?.toInstant()?.toEpochMilli(),
+    shouldSync = shouldSync,
 )
diff --git a/app/src/main/java/illyan/jay/data/disk/dao/LocationDao.kt b/app/src/main/java/illyan/jay/data/room/dao/LocationDao.kt
similarity index 96%
rename from app/src/main/java/illyan/jay/data/disk/dao/LocationDao.kt
rename to app/src/main/java/illyan/jay/data/room/dao/LocationDao.kt
index 2e5bb06d..e4c575da 100644
--- a/app/src/main/java/illyan/jay/data/disk/dao/LocationDao.kt
+++ b/app/src/main/java/illyan/jay/data/room/dao/LocationDao.kt
@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.disk.dao
+package illyan.jay.data.room.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
@@ -25,7 +25,7 @@ import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Transaction
 import androidx.room.Update
-import illyan.jay.data.disk.model.RoomLocation
+import illyan.jay.data.room.model.RoomLocation
 import kotlinx.coroutines.flow.Flow
 
 @Dao
diff --git a/app/src/main/java/illyan/jay/data/disk/dao/PreferencesDao.kt b/app/src/main/java/illyan/jay/data/room/dao/PreferencesDao.kt
similarity index 87%
rename from app/src/main/java/illyan/jay/data/disk/dao/PreferencesDao.kt
rename to app/src/main/java/illyan/jay/data/room/dao/PreferencesDao.kt
index 2b06fe1a..748e6232 100644
--- a/app/src/main/java/illyan/jay/data/disk/dao/PreferencesDao.kt
+++ b/app/src/main/java/illyan/jay/data/room/dao/PreferencesDao.kt
@@ -16,14 +16,14 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.disk.dao
+package illyan.jay.data.room.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import illyan.jay.data.disk.model.RoomPreferences
+import illyan.jay.data.room.model.RoomPreferences
 import kotlinx.coroutines.flow.Flow
 import java.time.Instant
 
@@ -41,8 +41,8 @@ interface PreferencesDao {
     @Query("DELETE FROM preferences WHERE userUUID IS :userUUID")
     fun deletePreferences(userUUID: String)
 
-    @Query("UPDATE preferences SET analyticsEnabled = :analyticsEnabled, lastUpdate = :lastUpdate WHERE userUUID IS :userUUID")
-    fun setAnalyticsEnabled(userUUID: String, analyticsEnabled: Boolean, lastUpdate: Long = Instant.now().toEpochMilli())
+    @Query("UPDATE preferences SET analyticsEnabled = :analyticsEnabled, lastUpdate = :lastUpdate, lastUpdateToAnalytics = :lastUpdateToAnalytics WHERE userUUID IS :userUUID")
+    fun setAnalyticsEnabled(userUUID: String, analyticsEnabled: Boolean, lastUpdate: Long = Instant.now().toEpochMilli(), lastUpdateToAnalytics: Long = Instant.now().toEpochMilli())
 
     @Query("UPDATE preferences SET freeDriveAutoStart = :freeDriveAutoStart, lastUpdate = :lastUpdate WHERE userUUID IS :userUUID")
     fun setFreeDriveAutoStart(userUUID: String, freeDriveAutoStart: Boolean, lastUpdate: Long = Instant.now().toEpochMilli())
diff --git a/app/src/main/java/illyan/jay/data/disk/dao/SensorEventDao.kt b/app/src/main/java/illyan/jay/data/room/dao/SensorEventDao.kt
similarity index 96%
rename from app/src/main/java/illyan/jay/data/disk/dao/SensorEventDao.kt
rename to app/src/main/java/illyan/jay/data/room/dao/SensorEventDao.kt
index 11878bc1..243650cf 100644
--- a/app/src/main/java/illyan/jay/data/disk/dao/SensorEventDao.kt
+++ b/app/src/main/java/illyan/jay/data/room/dao/SensorEventDao.kt
@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.disk.dao
+package illyan.jay.data.room.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
@@ -24,7 +24,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
-import illyan.jay.data.disk.model.RoomSensorEvent
+import illyan.jay.data.room.model.RoomSensorEvent
 import kotlinx.coroutines.flow.Flow
 
 @Dao
diff --git a/app/src/main/java/illyan/jay/data/disk/dao/SessionDao.kt b/app/src/main/java/illyan/jay/data/room/dao/SessionDao.kt
similarity index 98%
rename from app/src/main/java/illyan/jay/data/disk/dao/SessionDao.kt
rename to app/src/main/java/illyan/jay/data/room/dao/SessionDao.kt
index b6cb9dd7..2fdba5bc 100644
--- a/app/src/main/java/illyan/jay/data/disk/dao/SessionDao.kt
+++ b/app/src/main/java/illyan/jay/data/room/dao/SessionDao.kt
@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.disk.dao
+package illyan.jay.data.room.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
@@ -25,7 +25,7 @@ import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Transaction
 import androidx.room.Update
-import illyan.jay.data.disk.model.RoomSession
+import illyan.jay.data.room.model.RoomSession
 import kotlinx.coroutines.flow.Flow
 
 @Dao
diff --git a/app/src/main/java/illyan/jay/data/disk/datasource/LocationDiskDataSource.kt b/app/src/main/java/illyan/jay/data/room/datasource/LocationRoomDataSource.kt
similarity index 92%
rename from app/src/main/java/illyan/jay/data/disk/datasource/LocationDiskDataSource.kt
rename to app/src/main/java/illyan/jay/data/room/datasource/LocationRoomDataSource.kt
index 9d27d7ef..f43e02c5 100644
--- a/app/src/main/java/illyan/jay/data/disk/datasource/LocationDiskDataSource.kt
+++ b/app/src/main/java/illyan/jay/data/room/datasource/LocationRoomDataSource.kt
@@ -16,12 +16,12 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.disk.datasource
+package illyan.jay.data.room.datasource
 
-import illyan.jay.data.disk.dao.LocationDao
-import illyan.jay.data.disk.model.RoomLocation
-import illyan.jay.data.disk.toDomainModel
-import illyan.jay.data.disk.toRoomModel
+import illyan.jay.data.room.dao.LocationDao
+import illyan.jay.data.room.model.RoomLocation
+import illyan.jay.data.room.toDomainModel
+import illyan.jay.data.room.toRoomModel
 import illyan.jay.domain.model.DomainLocation
 import kotlinx.coroutines.flow.map
 import timber.log.Timber
@@ -35,7 +35,7 @@ import javax.inject.Singleton
  * @constructor Create empty Location disk data source
  */
 @Singleton
-class LocationDiskDataSource @Inject constructor(
+class LocationRoomDataSource @Inject constructor(
     private val locationDao: LocationDao
 ) {
     /**
diff --git a/app/src/main/java/illyan/jay/data/disk/datasource/PreferencesDiskDataSource.kt b/app/src/main/java/illyan/jay/data/room/datasource/PreferencesRoomDataSource.kt
similarity index 93%
rename from app/src/main/java/illyan/jay/data/disk/datasource/PreferencesDiskDataSource.kt
rename to app/src/main/java/illyan/jay/data/room/datasource/PreferencesRoomDataSource.kt
index 3c9bbc10..5c2127b1 100644
--- a/app/src/main/java/illyan/jay/data/disk/datasource/PreferencesDiskDataSource.kt
+++ b/app/src/main/java/illyan/jay/data/room/datasource/PreferencesRoomDataSource.kt
@@ -16,18 +16,18 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.disk.datasource
+package illyan.jay.data.room.datasource
 
-import illyan.jay.data.disk.dao.PreferencesDao
-import illyan.jay.data.disk.toDomainModel
-import illyan.jay.data.disk.toRoomModel
+import illyan.jay.data.room.dao.PreferencesDao
+import illyan.jay.data.room.toDomainModel
+import illyan.jay.data.room.toRoomModel
 import illyan.jay.domain.model.DomainPreferences
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import timber.log.Timber
 import javax.inject.Inject
 
-class PreferencesDiskDataSource @Inject constructor(
+class PreferencesRoomDataSource @Inject constructor(
     private val preferencesDao: PreferencesDao
 ) {
     fun getPreferences(userUUID: String): Flow<DomainPreferences?> {
diff --git a/app/src/main/java/illyan/jay/data/disk/datasource/SensorEventDiskDataSource.kt b/app/src/main/java/illyan/jay/data/room/datasource/SensorEventRoomDataSource.kt
similarity index 91%
rename from app/src/main/java/illyan/jay/data/disk/datasource/SensorEventDiskDataSource.kt
rename to app/src/main/java/illyan/jay/data/room/datasource/SensorEventRoomDataSource.kt
index aff5626b..4091d486 100644
--- a/app/src/main/java/illyan/jay/data/disk/datasource/SensorEventDiskDataSource.kt
+++ b/app/src/main/java/illyan/jay/data/room/datasource/SensorEventRoomDataSource.kt
@@ -16,12 +16,12 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.disk.datasource
+package illyan.jay.data.room.datasource
 
-import illyan.jay.data.disk.dao.SensorEventDao
-import illyan.jay.data.disk.model.RoomSensorEvent
-import illyan.jay.data.disk.toDomainModel
-import illyan.jay.data.disk.toRoomModel
+import illyan.jay.data.room.dao.SensorEventDao
+import illyan.jay.data.room.model.RoomSensorEvent
+import illyan.jay.data.room.toDomainModel
+import illyan.jay.data.room.toRoomModel
 import illyan.jay.domain.model.DomainSensorEvent
 import illyan.jay.domain.model.DomainSession
 import kotlinx.coroutines.flow.map
@@ -35,7 +35,7 @@ import javax.inject.Singleton
  * @constructor Create empty SensorEvent disk data source
  */
 @Singleton
-class SensorEventDiskDataSource @Inject constructor(
+class SensorEventRoomDataSource @Inject constructor(
     private val sensorEventDao: SensorEventDao
 ) {
     /**
diff --git a/app/src/main/java/illyan/jay/data/disk/datasource/SessionDiskDataSource.kt b/app/src/main/java/illyan/jay/data/room/datasource/SessionRoomDataSource.kt
similarity index 96%
rename from app/src/main/java/illyan/jay/data/disk/datasource/SessionDiskDataSource.kt
rename to app/src/main/java/illyan/jay/data/room/datasource/SessionRoomDataSource.kt
index 9f454efb..c8092b7f 100644
--- a/app/src/main/java/illyan/jay/data/disk/datasource/SessionDiskDataSource.kt
+++ b/app/src/main/java/illyan/jay/data/room/datasource/SessionRoomDataSource.kt
@@ -16,13 +16,13 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.disk.datasource
+package illyan.jay.data.room.datasource
 
 import com.google.android.gms.maps.model.LatLng
-import illyan.jay.data.disk.dao.SessionDao
-import illyan.jay.data.disk.model.RoomSession
-import illyan.jay.data.disk.toDomainModel
-import illyan.jay.data.disk.toRoomModel
+import illyan.jay.data.room.dao.SessionDao
+import illyan.jay.data.room.model.RoomSession
+import illyan.jay.data.room.toDomainModel
+import illyan.jay.data.room.toRoomModel
 import illyan.jay.domain.model.DomainSession
 import kotlinx.coroutines.flow.map
 import timber.log.Timber
@@ -40,7 +40,7 @@ import javax.inject.Singleton
  * @constructor Create empty Session disk data source
  */
 @Singleton
-class SessionDiskDataSource @Inject constructor(
+class SessionRoomDataSource @Inject constructor(
     private val sessionDao: SessionDao,
 ) {
     /**
diff --git a/app/src/main/java/illyan/jay/data/disk/model/RoomLocation.kt b/app/src/main/java/illyan/jay/data/room/model/RoomLocation.kt
similarity index 97%
rename from app/src/main/java/illyan/jay/data/disk/model/RoomLocation.kt
rename to app/src/main/java/illyan/jay/data/room/model/RoomLocation.kt
index 07ef21d6..2ee72d41 100644
--- a/app/src/main/java/illyan/jay/data/disk/model/RoomLocation.kt
+++ b/app/src/main/java/illyan/jay/data/room/model/RoomLocation.kt
@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.disk.model
+package illyan.jay.data.room.model
 
 import androidx.room.Entity
 import androidx.room.ForeignKey
diff --git a/app/src/main/java/illyan/jay/data/disk/model/RoomPreferences.kt b/app/src/main/java/illyan/jay/data/room/model/RoomPreferences.kt
similarity index 94%
rename from app/src/main/java/illyan/jay/data/disk/model/RoomPreferences.kt
rename to app/src/main/java/illyan/jay/data/room/model/RoomPreferences.kt
index 18a6da11..4a3c1cfc 100644
--- a/app/src/main/java/illyan/jay/data/disk/model/RoomPreferences.kt
+++ b/app/src/main/java/illyan/jay/data/room/model/RoomPreferences.kt
@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.disk.model
+package illyan.jay.data.room.model
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
@@ -34,5 +34,6 @@ data class RoomPreferences(
     val analyticsEnabled: Boolean = DomainPreferences.Default.analyticsEnabled,
     val showAds: Boolean = DomainPreferences.Default.showAds,
     val lastUpdate: Long = ZonedDateTime.now().toInstant().toEpochMilli(),
+    val lastUpdateToAnalytics: Long? = null,
     val shouldSync: Boolean = DomainPreferences.Default.shouldSync,
 )
diff --git a/app/src/main/java/illyan/jay/data/disk/model/RoomSensorEvent.kt b/app/src/main/java/illyan/jay/data/room/model/RoomSensorEvent.kt
similarity index 97%
rename from app/src/main/java/illyan/jay/data/disk/model/RoomSensorEvent.kt
rename to app/src/main/java/illyan/jay/data/room/model/RoomSensorEvent.kt
index cde59292..7a67eb73 100644
--- a/app/src/main/java/illyan/jay/data/disk/model/RoomSensorEvent.kt
+++ b/app/src/main/java/illyan/jay/data/room/model/RoomSensorEvent.kt
@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.disk.model
+package illyan.jay.data.room.model
 
 import androidx.room.Entity
 import androidx.room.ForeignKey
diff --git a/app/src/main/java/illyan/jay/data/disk/model/RoomSession.kt b/app/src/main/java/illyan/jay/data/room/model/RoomSession.kt
similarity index 97%
rename from app/src/main/java/illyan/jay/data/disk/model/RoomSession.kt
rename to app/src/main/java/illyan/jay/data/room/model/RoomSession.kt
index 61943dd7..ceb61cd3 100644
--- a/app/src/main/java/illyan/jay/data/disk/model/RoomSession.kt
+++ b/app/src/main/java/illyan/jay/data/room/model/RoomSession.kt
@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.disk.model
+package illyan.jay.data.room.model
 
 import androidx.room.Entity
 import androidx.room.Index
diff --git a/app/src/main/java/illyan/jay/data/disk/model/SensorOptions.kt b/app/src/main/java/illyan/jay/data/room/model/SensorOptions.kt
similarity index 96%
rename from app/src/main/java/illyan/jay/data/disk/model/SensorOptions.kt
rename to app/src/main/java/illyan/jay/data/room/model/SensorOptions.kt
index 3a67855d..419366fb 100644
--- a/app/src/main/java/illyan/jay/data/disk/model/SensorOptions.kt
+++ b/app/src/main/java/illyan/jay/data/room/model/SensorOptions.kt
@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.data.disk.model
+package illyan.jay.data.room.model
 
 data class SensorOptions(
     val sensorType: Int,
diff --git a/app/src/main/java/illyan/jay/data/serializers/AppSettingsSerializer.kt b/app/src/main/java/illyan/jay/data/serializers/AppSettingsSerializer.kt
index 3d54d354..dd469e99 100644
--- a/app/src/main/java/illyan/jay/data/serializers/AppSettingsSerializer.kt
+++ b/app/src/main/java/illyan/jay/data/serializers/AppSettingsSerializer.kt
@@ -19,7 +19,7 @@
 package illyan.jay.data.serializers
 
 import androidx.datastore.core.Serializer
-import illyan.jay.data.disk.model.AppSettings
+import illyan.jay.data.datastore.model.AppSettings
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.SerializationException
diff --git a/app/src/main/java/illyan/jay/data/serializers/ZonedDateTimeNullableSerializer.kt b/app/src/main/java/illyan/jay/data/serializers/ZonedDateTimeNullableSerializer.kt
new file mode 100644
index 00000000..c4865cc5
--- /dev/null
+++ b/app/src/main/java/illyan/jay/data/serializers/ZonedDateTimeNullableSerializer.kt
@@ -0,0 +1,24 @@
+package illyan.jay.data.serializers
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import java.time.ZonedDateTime
+
+object ZonedDateTimeNullableSerializer : KSerializer<ZonedDateTime?> {
+    override val descriptor: SerialDescriptor
+        get() = PrimitiveSerialDescriptor("java.time.ZonedDateTime?", PrimitiveKind.STRING)
+
+    override fun deserialize(decoder: Decoder): ZonedDateTime? {
+        val decoded = decoder.decodeString()
+        if (decoded == "null") return null
+        return ZonedDateTime.parse(decoded)
+    }
+
+    override fun serialize(encoder: Encoder, value: ZonedDateTime?) {
+        encoder.encodeString(value.toString())
+    }
+}
diff --git a/app/src/main/java/illyan/jay/data/serializers/ZonedDateTimeSerializer.kt b/app/src/main/java/illyan/jay/data/serializers/ZonedDateTimeSerializer.kt
index 08e88685..57bc7108 100644
--- a/app/src/main/java/illyan/jay/data/serializers/ZonedDateTimeSerializer.kt
+++ b/app/src/main/java/illyan/jay/data/serializers/ZonedDateTimeSerializer.kt
@@ -37,4 +37,4 @@ object ZonedDateTimeSerializer : KSerializer<ZonedDateTime> {
     override fun serialize(encoder: Encoder, value: ZonedDateTime) {
         encoder.encodeString(value.toString())
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/illyan/jay/di/AppModule.kt b/app/src/main/java/illyan/jay/di/AppModule.kt
index 76ecfe68..2035af2f 100644
--- a/app/src/main/java/illyan/jay/di/AppModule.kt
+++ b/app/src/main/java/illyan/jay/di/AppModule.kt
@@ -92,6 +92,7 @@ object AppModule {
     fun provideCrashlytics() = Firebase.crashlytics
 
     @Provides
+    @Singleton
     fun provideDebugTree() = Timber.DebugTree()
 
     @Provides
diff --git a/app/src/main/java/illyan/jay/di/DataStoreModule.kt b/app/src/main/java/illyan/jay/di/DataStoreModule.kt
index f6e2bf89..05150b3d 100644
--- a/app/src/main/java/illyan/jay/di/DataStoreModule.kt
+++ b/app/src/main/java/illyan/jay/di/DataStoreModule.kt
@@ -27,7 +27,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import illyan.jay.data.disk.model.AppSettings
+import illyan.jay.data.datastore.model.AppSettings
 import illyan.jay.data.serializers.AppSettingsSerializer
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/illyan/jay/di/FirebaseModule.kt b/app/src/main/java/illyan/jay/di/FirebaseModule.kt
index c69695ab..68543465 100644
--- a/app/src/main/java/illyan/jay/di/FirebaseModule.kt
+++ b/app/src/main/java/illyan/jay/di/FirebaseModule.kt
@@ -33,6 +33,7 @@ import dagger.hilt.components.SingletonComponent
 import illyan.jay.R
 import timber.log.Timber
 import javax.inject.Singleton
+import kotlin.time.Duration.Companion.days
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -57,18 +58,18 @@ object FirebaseModule {
     fun provideFirebaseRemoteConfig(): FirebaseRemoteConfig {
         val remoteConfig = Firebase.remoteConfig
         val configSettings = remoteConfigSettings {
-            minimumFetchIntervalInSeconds = 3600
+            minimumFetchIntervalInSeconds = 30.days.inWholeSeconds
+            fetchTimeoutInSeconds
         }
         remoteConfig.setDefaultsAsync(R.xml.remote_config_defaults)
         remoteConfig.setConfigSettingsAsync(configSettings)
-        remoteConfig.fetchAndActivate()
-            .addOnCompleteListener { task ->
-                if (task.isSuccessful) {
-                    Timber.d("Successfully fetched and activated remoteConfig key-value pairs!")
-                } else {
-                    Timber.e(task.exception, "Error when fetching key-value pairs via FirebaseRemoteConfig: ${task.exception?.message}")
-                }
+        remoteConfig.fetchAndActivate().addOnCompleteListener { task ->
+            if (task.isSuccessful) {
+                Timber.d("Successfully fetched and activated remoteConfig key-value pairs!")
+            } else {
+                Timber.e(task.exception, "Error when fetching key-value pairs via FirebaseRemoteConfig: ${task.exception?.message}")
             }
+        }
         return remoteConfig
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/illyan/jay/di/FirestoreModule.kt b/app/src/main/java/illyan/jay/di/FirestoreModule.kt
new file mode 100644
index 00000000..f0ed07fe
--- /dev/null
+++ b/app/src/main/java/illyan/jay/di/FirestoreModule.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2023 Balázs Püspök-Kiss (Illyan)
+ *
+ * Jay is a driver behaviour analytics app.
+ *
+ * This file is part of Jay.
+ *
+ * Jay is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ * Jay is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Jay.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package illyan.jay.di
+
+import androidx.lifecycle.Lifecycle
+import com.google.firebase.firestore.DocumentSnapshot
+import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.firestore.MetadataChanges
+import com.google.firebase.firestore.QuerySnapshot
+import com.google.firebase.firestore.ktx.snapshots
+import com.google.firebase.firestore.ktx.toObject
+import com.google.firebase.firestore.ktx.toObjects
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import illyan.jay.data.firestore.datasource.FirestoreDocumentSnapshotHandler
+import illyan.jay.data.firestore.datasource.FirestoreQuerySnapshotHandler
+import illyan.jay.data.firestore.datasource.FirestoreSnapshotHandler
+import illyan.jay.data.firestore.datasource.UserPathsFirestoreDataFlow
+import illyan.jay.data.firestore.model.FirestorePath
+import illyan.jay.data.firestore.model.FirestoreUser
+import illyan.jay.domain.interactor.AuthInteractor
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.map
+
+@Module
+@InstallIn(SingletonComponent::class)
+object FirestoreModule {
+
+    @Provides
+    @UserSnapshotHandler
+    fun provideFirestoreUserSnapshotHandler(
+        firestore: FirebaseFirestore,
+        authInteractor: AuthInteractor,
+    ): FirestoreSnapshotHandler<FirestoreUser, DocumentSnapshot> {
+        return FirestoreDocumentSnapshotHandler(
+            snapshotToObject = { it.toObject() },
+            snapshotSourceFlow = authInteractor.userUUIDStateFlow.map { uuid ->
+                if (uuid != null) {
+                    firestore
+                        .collection(FirestoreUser.CollectionName)
+                        .document(uuid)
+                        .snapshots(MetadataChanges.INCLUDE)
+                } else {
+                    null
+                }
+            },
+            initialReference = authInteractor.userUUID?.let { uuid ->
+                firestore
+                    .collection(FirestoreUser.CollectionName)
+                    .document(uuid)
+                }
+        )
+    }
+
+    @Provides
+    @UserPathsSnapshotHandler
+    fun provideFirestorePathSnapshotHandler(
+        firestore: FirebaseFirestore,
+        authInteractor: AuthInteractor,
+    ): FirestoreSnapshotHandler<List<FirestorePath>, QuerySnapshot> {
+        return FirestoreQuerySnapshotHandler(
+            snapshotToObject = { it.toObjects() },
+            snapshotSourceFlow = authInteractor.userUUIDStateFlow.map { uuid ->
+                if (uuid != null) {
+                    firestore
+                        .collection(FirestorePath.CollectionName)
+                        .whereEqualTo(FirestorePath.FieldOwnerUUID, uuid)
+                        .snapshots(MetadataChanges.INCLUDE)
+                } else {
+                    null
+                }
+            }
+        )
+    }
+
+    @Provides
+    fun provideUserPathsFirestoreDataFlow(
+        firestore: FirebaseFirestore,
+        authInteractor: AuthInteractor,
+        appLifecycle: Lifecycle,
+        @CoroutineScopeIO coroutineScopeIO: CoroutineScope
+    ): () -> UserPathsFirestoreDataFlow = {
+        UserPathsFirestoreDataFlow(
+            firestore = firestore,
+            appLifecycle = appLifecycle,
+            coroutineScopeIO = coroutineScopeIO,
+            snapshotHandler = provideFirestorePathSnapshotHandler(
+                firestore = firestore,
+                authInteractor = authInteractor
+            )
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/illyan/jay/di/FirestoreSnapshotHandlerQualifier.kt b/app/src/main/java/illyan/jay/di/FirestoreSnapshotHandlerQualifier.kt
new file mode 100644
index 00000000..26117562
--- /dev/null
+++ b/app/src/main/java/illyan/jay/di/FirestoreSnapshotHandlerQualifier.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2023 Balázs Püspök-Kiss (Illyan)
+ *
+ * Jay is a driver behaviour analytics app.
+ *
+ * This file is part of Jay.
+ *
+ * Jay is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ * Jay is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Jay.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package illyan.jay.di
+
+import javax.inject.Qualifier
+
+@Qualifier
+@Retention(AnnotationRetention.RUNTIME)
+annotation class UserSnapshotHandler
+
+@Qualifier
+@Retention(AnnotationRetention.RUNTIME)
+annotation class UserPathsSnapshotHandler
diff --git a/app/src/main/java/illyan/jay/di/RoomModule.kt b/app/src/main/java/illyan/jay/di/RoomModule.kt
index f2b34b41..e69c3d64 100644
--- a/app/src/main/java/illyan/jay/di/RoomModule.kt
+++ b/app/src/main/java/illyan/jay/di/RoomModule.kt
@@ -27,7 +27,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import illyan.jay.data.disk.JayDatabase
+import illyan.jay.data.room.JayDatabase
 import timber.log.Timber
 import javax.inject.Singleton
 
diff --git a/app/src/main/java/illyan/jay/domain/interactor/AuthInteractor.kt b/app/src/main/java/illyan/jay/domain/interactor/AuthInteractor.kt
index 3a146868..eb37b9a2 100644
--- a/app/src/main/java/illyan/jay/domain/interactor/AuthInteractor.kt
+++ b/app/src/main/java/illyan/jay/domain/interactor/AuthInteractor.kt
@@ -86,18 +86,21 @@ class AuthInteractor @Inject constructor(
     val isUserSigningOut = _isSigningOut.asStateFlow()
 
     init {
-        addAuthStateListener { state ->
-            if (state.currentUser != null) {
-                Timber.i("User ${state.currentUser!!.uid.take(4)} signed into Firebase")
-            } else {
-                Timber.i("User ${userUUID?.take(4)} signed out of Firebase")
-            }
-            _userStateFlow.update { state.currentUser }
-            _isUserSignedInStateFlow.update { state.currentUser != null }
-            _userPhotoUrlStateFlow.update { state.currentUser?.photoUrl }
-            _userUUIDStateFlow.update { state.currentUser?.uid }
-            _userDisplayNameStateFlow.update { state.currentUser?.displayName }
+        refreshUserState(auth)
+        addAuthStateListener(::refreshUserState)
+    }
+
+    private fun refreshUserState(state: FirebaseAuth = auth) {
+        if (state.currentUser != null) {
+            Timber.i("User ${state.currentUser!!.uid.take(4)} signed into Firebase")
+        } else {
+            Timber.i("User is signed out of Firebase")
         }
+        _userStateFlow.update { state.currentUser }
+        _isUserSignedInStateFlow.update { state.currentUser != null }
+        _userPhotoUrlStateFlow.update { state.currentUser?.photoUrl }
+        _userUUIDStateFlow.update { state.currentUser?.uid }
+        _userDisplayNameStateFlow.update { state.currentUser?.displayName }
     }
 
     fun signOut() {
@@ -127,16 +130,20 @@ class AuthInteractor @Inject constructor(
     fun signInViaGoogle(activity: MainActivity) {
         if (isUserSignedIn) return
         if (_googleSignInClient.value == null) {
-            remoteConfig.ensureInitialized().addOnCompleteListener {
-                _googleSignInClient.value = GoogleSignIn.getClient(
-                    activity,
-                    GoogleSignInOptions
-                        .Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
-                        .requestIdToken(remoteConfig["default_web_client_id"].asString())
-                        .requestEmail()
-                        .build()
-                )
-                activity.googleSignInLauncher.launch(googleSignInClient.value!!.signInIntent)
+            remoteConfig.fetchAndActivate().addOnCompleteListener {
+                remoteConfig.ensureInitialized().addOnCompleteListener {
+                    _googleSignInClient.update {
+                        GoogleSignIn.getClient(
+                            activity,
+                            GoogleSignInOptions
+                                .Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+                                .requestIdToken(remoteConfig["default_web_client_id"].asString())
+                                .requestEmail()
+                                .build()
+                        )
+                    }
+                    activity.googleSignInLauncher.launch(googleSignInClient.value!!.signInIntent)
+                }
             }
         } else {
             activity.googleSignInLauncher.launch(googleSignInClient.value!!.signInIntent)
@@ -178,16 +185,15 @@ class AuthInteractor @Inject constructor(
         activity: Activity,
         credential: AuthCredential
     ) {
-        auth.signInWithCredential(credential)
-            .addOnCompleteListener(activity) { task ->
-                if (task.isSuccessful) {
-                    // Sign in success, update UI with the signed-in user's information
-                    Timber.i("Firebase authentication successful")
-                } else {
-                    // If sign in fails, display a message to the user.
-                    Timber.e(task.exception, task.exception?.message)
-                }
+        auth.signInWithCredential(credential).addOnCompleteListener(activity) { task ->
+            if (task.isSuccessful) {
+                // Sign in success, update UI with the signed-in user's information
+                Timber.i("Firebase authentication successful")
+            } else {
+                // If sign in fails, display a message to the user.
+                Timber.e(task.exception, task.exception?.message)
             }
+        }
     }
 
     /**
@@ -196,20 +202,19 @@ class AuthInteractor @Inject constructor(
      * @param listener listener to add to state changes.
      * @receiver receives a copy of current FirebaseAuth object as a state.
      */
-    fun addAuthStateListener(
-        listener: (FirebaseAuth) -> Unit
-    ) {
-        auth.addAuthStateListener {
-            listener(it)
-        }
+    fun addAuthStateListener(listener: (FirebaseAuth) -> Unit) {
+        auth.addAuthStateListener(listener)
     }
 
     // Each listener emit when they are ready to sign out
-    private val onSignOutListeners = mutableListOf<(onOperationFinished: () -> Unit) -> Unit>()
+    private val onSignOutListeners = mutableListOf<(approveSignOut: () -> Unit) -> Unit>()
 
-    fun addOnSignOutListener(
-        listener: (() -> Unit) -> Unit
-    ) {
+    /**
+     * Sign Out listeners used to be called when the user is would like to sign out.
+     * Each and every sign out listener should approve this sign out request by
+     * calling the lambda method passed in as a parameter.
+     */
+    fun addOnSignOutListener(listener: (approveSignOut: () -> Unit) -> Unit) {
         onSignOutListeners.add(listener)
     }
 
diff --git a/app/src/main/java/illyan/jay/domain/interactor/LocationInteractor.kt b/app/src/main/java/illyan/jay/domain/interactor/LocationInteractor.kt
index 43f76416..40cc7c14 100644
--- a/app/src/main/java/illyan/jay/domain/interactor/LocationInteractor.kt
+++ b/app/src/main/java/illyan/jay/domain/interactor/LocationInteractor.kt
@@ -18,18 +18,21 @@
 
 package illyan.jay.domain.interactor
 
-import illyan.jay.data.disk.datasource.LocationDiskDataSource
-import illyan.jay.data.network.datasource.LocationNetworkDataSource
-import illyan.jay.data.network.datasource.SessionNetworkDataSource
+import illyan.jay.data.firestore.datasource.PathFirestoreDataSource
+import illyan.jay.data.firestore.datasource.SessionFirestoreDataSource
+import illyan.jay.data.room.datasource.LocationRoomDataSource
 import illyan.jay.di.CoroutineScopeIO
+import illyan.jay.di.CoroutineScopeMain
 import illyan.jay.domain.model.DomainLocation
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
@@ -39,17 +42,18 @@ import javax.inject.Singleton
  * Location interactor is a layer which aims to be the intermediary
  * between a higher level logic and lower level data source.
  *
- * @property locationDiskDataSource local datasource
+ * @property locationRoomDataSource local datasource
  * @constructor Create empty Location interactor
  */
 @Singleton
 class LocationInteractor @Inject constructor(
-    private val locationDiskDataSource: LocationDiskDataSource,
-    private val locationNetworkDataSource: LocationNetworkDataSource,
+    private val locationRoomDataSource: LocationRoomDataSource,
+    private val pathFirestoreDataSource: PathFirestoreDataSource,
     private val authInteractor: AuthInteractor,
     private val sessionInteractor: SessionInteractor,
-    private val sessionNetworkDataSource: SessionNetworkDataSource,
+    private val sessionFirestoreDataSource: SessionFirestoreDataSource,
     @CoroutineScopeIO private val coroutineScopeIO: CoroutineScope,
+    @CoroutineScopeMain private val coroutineScopeMain: CoroutineScope,
 ) {
     /**
      * Get latest (most up to date) locations as a Flow for a particular session.
@@ -63,10 +67,10 @@ class LocationInteractor @Inject constructor(
      * the freshest location to older location data.
      */
     fun getLatestLocations(sessionUUID: String, limit: Long): Flow<List<DomainLocation>> {
-        return locationDiskDataSource.getLatestLocations(sessionUUID, limit)
+        return locationRoomDataSource.getLatestLocations(sessionUUID, limit)
     }
 
-    fun getLatestLocations(limit: Long) = locationDiskDataSource.getLatestLocations(limit)
+    fun getLatestLocations(limit: Long) = locationRoomDataSource.getLatestLocations(limit)
 
     /**
      * Get locations' data as a Flow for a particular session.
@@ -78,12 +82,12 @@ class LocationInteractor @Inject constructor(
      */
     fun getLocations(sessionUUID: String): Flow<List<DomainLocation>> {
         Timber.d("Trying to load path for session with ID from disk: ${sessionUUID.take(4)}")
-        return locationDiskDataSource.getLocations(sessionUUID)
+        return locationRoomDataSource.getLocations(sessionUUID)
     }
 
     fun getLocations(sessionUUIDs: List<String>): Flow<List<DomainLocation>> {
         Timber.d("Trying to load paths for session with ID from disk: ${sessionUUIDs.map { it.take(4) }}")
-        return locationDiskDataSource.getLocations(sessionUUIDs)
+        return locationRoomDataSource.getLocations(sessionUUIDs)
     }
 
     suspend fun getSyncedPath(sessionUUID: String): StateFlow<List<DomainLocation>?> {
@@ -98,19 +102,21 @@ class LocationInteractor @Inject constructor(
                             Timber.v("Not found path for session on disk, checking cloud")
                             if (!authInteractor.isUserSignedIn) {
                                 Timber.i("Not authenticated to access cloud, return an empty list")
-                                syncedPaths.value = emptyList()
+                                syncedPaths.update { emptyList() }
                             } else {
-                                locationNetworkDataSource.getLocations(sessionUUID) { remoteLocations ->
-                                    coroutineScopeIO.launch {
-                                        Timber.v("Found location for session, caching it on disk")
-                                        locationDiskDataSource.saveLocations(remoteLocations)
+                                coroutineScopeMain.launch {
+                                    pathFirestoreDataSource.getLocationsBySession(sessionUUID).collectLatest { remoteLocations ->
+                                        coroutineScopeIO.launch {
+                                            Timber.v("Found location for session, caching it on disk")
+                                            remoteLocations?.let { locationRoomDataSource.saveLocations(it) }
+                                        }
+                                        syncedPaths.update { remoteLocations }
                                     }
-                                    syncedPaths.value = remoteLocations
                                 }
                             }
                         } else {
                             Timber.i("Found path on disk")
-                            syncedPaths.value = locations
+                            syncedPaths.update { locations }
                         }
                         true
                     }
@@ -119,21 +125,23 @@ class LocationInteractor @Inject constructor(
                 Timber.v("Not found session on disk, checking cloud")
                 if (!authInteractor.isUserSignedIn) {
                     Timber.i("Not authenticated to access cloud, return an empty list")
-                    syncedPaths.value = emptyList()
+                    syncedPaths.update { emptyList() }
                 } else {
                     coroutineScopeIO.launch {
-                        sessionNetworkDataSource.sessions.first { sessions ->
+                        sessionFirestoreDataSource.sessions.first { sessions ->
                             if (sessions != null && sessions.any { it.uuid == sessionUUID }) {
                                 Timber.v("Found session in cloud, caching it on disk")
                                 coroutineScopeIO.launch {
                                     sessionInteractor.saveSession(sessions.first { it.uuid == sessionUUID })
-                                    locationNetworkDataSource.getLocations(sessionUUID) { remoteLocations ->
-                                        coroutineScopeIO.launch {
-                                            Timber.v("Found location for session, caching it on disk")
-                                            locationDiskDataSource.saveLocations(remoteLocations)
+                                    coroutineScopeMain.launch {
+                                        pathFirestoreDataSource.getLocationsBySession(sessionUUID).collectLatest { remoteLocations ->
+                                            coroutineScopeIO.launch {
+                                                Timber.v("Found location for session, caching it on disk")
+                                                remoteLocations?.let { locationRoomDataSource.saveLocations(it) }
+                                            }
+                                            Timber.i("Found path in cloud")
+                                            syncedPaths.update { remoteLocations }
                                         }
-                                        Timber.i("Found path in cloud")
-                                        syncedPaths.value = remoteLocations
                                     }
                                 }
                             }
@@ -155,7 +163,7 @@ class LocationInteractor @Inject constructor(
      *
      * @return id of location updated.
      */
-    fun saveLocation(location: DomainLocation) = locationDiskDataSource.saveLocation(location)
+    fun saveLocation(location: DomainLocation) = locationRoomDataSource.saveLocation(location)
 
     /**
      * Save locations' data to Room database.
@@ -164,12 +172,12 @@ class LocationInteractor @Inject constructor(
      * @param locations list of location data saved onto the Room database.
      */
     fun saveLocations(locations: List<DomainLocation>) {
-        locationDiskDataSource.saveLocations(locations)
+        locationRoomDataSource.saveLocations(locations)
     }
 
     fun isPathStoredForSession(sessionUUID: String): Flow<Boolean> {
         Timber.d("Checking if a path is stored for session $sessionUUID")
-        return locationDiskDataSource.getLatestLocations(sessionUUID, 1).map { it.isNotEmpty() }
+        return locationRoomDataSource.getLatestLocations(sessionUUID, 1).map { it.isNotEmpty() }
     }
 
 
diff --git a/app/src/main/java/illyan/jay/domain/interactor/SearchInteractor.kt b/app/src/main/java/illyan/jay/domain/interactor/SearchInteractor.kt
index 9b2e17b6..6b5b1ddd 100644
--- a/app/src/main/java/illyan/jay/domain/interactor/SearchInteractor.kt
+++ b/app/src/main/java/illyan/jay/domain/interactor/SearchInteractor.kt
@@ -21,7 +21,6 @@ package illyan.jay.domain.interactor
 import android.content.Intent
 import android.content.IntentFilter
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import com.mapbox.search.CompletionCallback
 import com.mapbox.search.ResponseInfo
 import com.mapbox.search.ReverseGeoOptions
 import com.mapbox.search.SearchCallback
@@ -29,6 +28,7 @@ import com.mapbox.search.SearchEngine
 import com.mapbox.search.SearchOptions
 import com.mapbox.search.SearchSelectionCallback
 import com.mapbox.search.SearchSuggestionsCallback
+import com.mapbox.search.common.CompletionCallback
 import com.mapbox.search.record.FavoriteRecord
 import com.mapbox.search.record.FavoritesDataProvider
 import com.mapbox.search.record.HistoryDataProvider
diff --git a/app/src/main/java/illyan/jay/domain/interactor/SensorEventInteractor.kt b/app/src/main/java/illyan/jay/domain/interactor/SensorEventInteractor.kt
index 7b1c383c..8fcd7264 100644
--- a/app/src/main/java/illyan/jay/domain/interactor/SensorEventInteractor.kt
+++ b/app/src/main/java/illyan/jay/domain/interactor/SensorEventInteractor.kt
@@ -18,7 +18,7 @@
 
 package illyan.jay.domain.interactor
 
-import illyan.jay.data.disk.datasource.SensorEventDiskDataSource
+import illyan.jay.data.room.datasource.SensorEventRoomDataSource
 import illyan.jay.domain.model.DomainSensorEvent
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -27,12 +27,12 @@ import javax.inject.Singleton
  * Acceleration interactor is a layer which aims to be the intermediary
  * between a higher level logic and lower level data source.
  *
- * @property sensorEventDiskDataSource local datasource
+ * @property sensorEventRoomDataSource local datasource
  * @constructor Create empty Acceleration interactor
  */
 @Singleton
 class SensorEventInteractor @Inject constructor(
-    private val sensorEventDiskDataSource: SensorEventDiskDataSource
+    private val sensorEventRoomDataSource: SensorEventRoomDataSource
 ) {
     /**
      * Save an acceleration data instance.
@@ -40,7 +40,7 @@ class SensorEventInteractor @Inject constructor(
      * @param sensorEvent acceleration data to be saved.
      */
     fun saveSensorEvent(sensorEvent: DomainSensorEvent) =
-        sensorEventDiskDataSource.saveSensorEvent(sensorEvent)
+        sensorEventRoomDataSource.saveSensorEvent(sensorEvent)
 
     /**
      * Save multiple acceleration data instances.
@@ -48,5 +48,5 @@ class SensorEventInteractor @Inject constructor(
      * @param sensorEvents multiple accelerations to be saved.
      */
     fun saveSensorEvents(sensorEvents: List<DomainSensorEvent>) =
-        sensorEventDiskDataSource.saveSensorEvents(sensorEvents)
+        sensorEventRoomDataSource.saveSensorEvents(sensorEvents)
 }
diff --git a/app/src/main/java/illyan/jay/domain/interactor/SessionInteractor.kt b/app/src/main/java/illyan/jay/domain/interactor/SessionInteractor.kt
index 7ca4de72..9f4fc35e 100644
--- a/app/src/main/java/illyan/jay/domain/interactor/SessionInteractor.kt
+++ b/app/src/main/java/illyan/jay/domain/interactor/SessionInteractor.kt
@@ -22,12 +22,11 @@ import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.WriteBatch
 import com.mapbox.geojson.Point
 import com.mapbox.search.ReverseGeoOptions
-import illyan.jay.data.disk.datasource.LocationDiskDataSource
-import illyan.jay.data.disk.datasource.SensorEventDiskDataSource
-import illyan.jay.data.disk.datasource.SessionDiskDataSource
-import illyan.jay.data.network.datasource.LocationNetworkDataSource
-import illyan.jay.data.network.datasource.SessionNetworkDataSource
-import illyan.jay.data.network.datasource.UserNetworkDataSource
+import illyan.jay.data.firestore.datasource.PathFirestoreDataSource
+import illyan.jay.data.firestore.datasource.SessionFirestoreDataSource
+import illyan.jay.data.room.datasource.LocationRoomDataSource
+import illyan.jay.data.room.datasource.SensorEventRoomDataSource
+import illyan.jay.data.room.datasource.SessionRoomDataSource
 import illyan.jay.di.CoroutineScopeIO
 import illyan.jay.domain.model.DomainLocation
 import illyan.jay.domain.model.DomainSession
@@ -53,21 +52,20 @@ import javax.inject.Singleton
  * Session interactor is a layer which aims to be the intermediary
  * between a higher level logic and lower level data source.
  *
- * @property sessionDiskDataSource local database
+ * @property sessionRoomDataSource local database
  * @constructor Create empty Session interactor
  */
 @Singleton
 class SessionInteractor @Inject constructor(
-    private val sessionDiskDataSource: SessionDiskDataSource,
-    private val sensorEventDiskDataSource: SensorEventDiskDataSource,
-    private val locationDiskDataSource: LocationDiskDataSource,
+    private val sessionRoomDataSource: SessionRoomDataSource,
+    private val sensorEventRoomDataSource: SensorEventRoomDataSource,
+    private val locationRoomDataSource: LocationRoomDataSource,
     private val searchInteractor: SearchInteractor,
-    private val sessionNetworkDataSource: SessionNetworkDataSource,
+    private val sessionFirestoreDataSource: SessionFirestoreDataSource,
     private val authInteractor: AuthInteractor,
     private val settingsInteractor: SettingsInteractor,
     private val serviceInteractor: ServiceInteractor,
-    private val locationNetworkDataSource: LocationNetworkDataSource,
-    private val userNetworkDataSource: UserNetworkDataSource,
+    private val pathFirestoreDataSource: PathFirestoreDataSource,
     private val firestore: FirebaseFirestore,
     @CoroutineScopeIO private val coroutineScopeIO: CoroutineScope,
 ) {
@@ -108,30 +106,30 @@ class SessionInteractor @Inject constructor(
      * otherwise a flow with null in it.
      */
     fun getSession(uuid: String): Flow<DomainSession?> {
-        return sessionDiskDataSource.getSession(uuid, authInteractor.userUUID).map { session ->
+        return sessionRoomDataSource.getSession(uuid, authInteractor.userUUID).map { session ->
             session?.let { refreshSessionLocation(it) }
             session
         }
     }
 
     private fun getSessions(uuids: List<String>): Flow<List<DomainSession>> {
-        return sessionDiskDataSource.getSessions(uuids).map { sessions ->
+        return sessionRoomDataSource.getSessions(uuids).map { sessions ->
             sessions.forEach { refreshSessionLocation(it) }
             sessions
         }
     }
 
-    val syncedSessions: StateFlow<List<DomainSession>?> get() = sessionNetworkDataSource.sessions.map { sessions ->
+    val syncedSessions: StateFlow<List<DomainSession>?> get() = sessionFirestoreDataSource.sessions.map { sessions ->
         sessions?.let {
             Timber.i("Got ${sessions.size} synced sessions for user ${sessions.firstOrNull()?.ownerUUID?.take(4)}")
-            sessionDiskDataSource.saveSessions(sessions)
+            sessionRoomDataSource.saveSessions(sessions)
         }
         sessions
     }.stateIn(coroutineScopeIO, SharingStarted.Eagerly, null)
 
     suspend fun uploadNotSyncedSessions() {
         if (!authInteractor.isUserSignedIn) return
-        sessionDiskDataSource.getStoppedSessions(authInteractor.userUUID!!).first { sessions ->
+        sessionRoomDataSource.getStoppedSessions(authInteractor.userUUID!!).first { sessions ->
             val localOnlySessions = sessions.filter { localSession ->
                 if (syncedSessions.value != null) {
                     !syncedSessions.value!!.any { it.uuid == localSession.uuid }
@@ -140,7 +138,7 @@ class SessionInteractor @Inject constructor(
                 }
             }
             Timber.i("${localOnlySessions.size} sessions are not synced with IDs: ${localOnlySessions.map { it.uuid.take(4) }}")
-            locationDiskDataSource.getLocations(localOnlySessions.map { it.uuid }).first { locations ->
+            locationRoomDataSource.getLocations(localOnlySessions.map { it.uuid }).first { locations ->
                 uploadSessions(
                     localOnlySessions,
                     locations,
@@ -155,11 +153,11 @@ class SessionInteractor @Inject constructor(
         if (!authInteractor.isUserSignedIn) return
         Timber.d("Batch created to delete session data for user ${authInteractor.userUUID?.take(4)} from cloud")
         firestore.runBatch(2) { batch, onOperationFinished ->
-            sessionNetworkDataSource.deleteAllSessions(
+            sessionFirestoreDataSource.deleteAllSessions(
                 batch = batch,
                 onWriteFinished = { onOperationFinished() }
             )
-            locationNetworkDataSource.deleteLocationsForUser(
+            pathFirestoreDataSource.deleteLocationsForUser(
                 batch = batch,
                 onWriteFinished = { onOperationFinished() }
             )
@@ -182,11 +180,11 @@ class SessionInteractor @Inject constructor(
         onWriteFinished: () -> Unit = {}
     ) {
         awaitOperations(2) { onOperationFinished ->
-            sessionNetworkDataSource.deleteAllSessions(
+            sessionFirestoreDataSource.deleteAllSessions(
                 batch = batch,
                 onWriteFinished = onOperationFinished
             )
-            locationNetworkDataSource.deleteLocationsForUser(
+            pathFirestoreDataSource.deleteLocationsForUser(
                 batch = batch,
                 onWriteFinished = onOperationFinished
             )
@@ -202,11 +200,11 @@ class SessionInteractor @Inject constructor(
         if (!authInteractor.isUserSignedIn || sessions.isEmpty()) return
         Timber.i("Upload ${sessions.size} sessions with location info to the cloud")
         firestore.runBatch { batch ->
-            sessionNetworkDataSource.insertSessions(
+            sessionFirestoreDataSource.insertSessions(
                 batch = batch,
                 domainSessions = sessions
             )
-            locationNetworkDataSource.insertLocations(
+            pathFirestoreDataSource.insertLocations(
                 batch = batch,
                 domainSessions = sessions,
                 domainLocations = locations
@@ -227,17 +225,17 @@ class SessionInteractor @Inject constructor(
      *
      * @return all session as a flow.
      */
-    fun getSessions() = sessionDiskDataSource.getSessions(authInteractor.userUUID)
+    fun getSessions() = sessionRoomDataSource.getSessions(authInteractor.userUUID)
 
-    fun getSessionUUIDs() = sessionDiskDataSource.getSessionUUIDs(authInteractor.userUUID)
+    fun getSessionUUIDs() = sessionRoomDataSource.getSessionUUIDs(authInteractor.userUUID)
 
-    fun getNotOwnedSessions() = sessionDiskDataSource.getAllNotOwnedSessions()
+    fun getNotOwnedSessions() = sessionRoomDataSource.getAllNotOwnedSessions()
 
     fun getOwnSessions(): Flow<List<DomainSession>> {
         return if (!authInteractor.isUserSignedIn) {
             flowOf(emptyList())
         } else {
-            sessionDiskDataSource.getSessionsByOwner(authInteractor.userUUID)
+            sessionRoomDataSource.getSessionsByOwner(authInteractor.userUUID)
         }
     }
 
@@ -246,7 +244,7 @@ class SessionInteractor @Inject constructor(
      *
      * @return a flow of ongoing sessions.
      */
-    fun getOngoingSessions() = sessionDiskDataSource.getOngoingSessions(authInteractor.userUUID)
+    fun getOngoingSessions() = sessionRoomDataSource.getOngoingSessions(authInteractor.userUUID)
 
     /**
      * Get ongoing sessions' IDs in a quicker way than getting all
@@ -255,7 +253,7 @@ class SessionInteractor @Inject constructor(
      * @return a flow of ongoing sessions' IDs.
      */
     fun getOngoingSessionUUIDs() =
-        sessionDiskDataSource.getOngoingSessionIds(authInteractor.userUUID)
+        sessionRoomDataSource.getOngoingSessionIds(authInteractor.userUUID)
 
     /**
      * Save session data.
@@ -273,7 +271,7 @@ class SessionInteractor @Inject constructor(
      */
     fun saveSessions(sessions: List<DomainSession>) {
         Timber.i("Saving ${sessions.size} sessions with IDs: ${sessions.map { it.uuid.take(4) }}")
-        sessionDiskDataSource.saveSessions(sessions)
+        sessionRoomDataSource.saveSessions(sessions)
     }
 
     /**
@@ -283,7 +281,7 @@ class SessionInteractor @Inject constructor(
      * @return ID of the newly started session.
      */
     suspend fun startSession(): String {
-        val sessionUUID = sessionDiskDataSource.startSession(
+        val sessionUUID = sessionRoomDataSource.startSession(
             ownerUUID = authInteractor.userUUID,
         )
         Timber.i("Starting a session with ID: $sessionUUID")
@@ -305,7 +303,7 @@ class SessionInteractor @Inject constructor(
                         }
                         Timber.d("Assigned client ${it.clientUUID?.take(4)} to session: $sessionUUID")
                         coroutineScopeIO.launch {
-                            sessionDiskDataSource.assignClientToSession(sessionUUID, session.clientUUID)
+                            sessionRoomDataSource.assignClientToSession(sessionUUID, session.clientUUID)
                             refreshSessionStartLocation(session)
                         }
                         true
@@ -326,7 +324,7 @@ class SessionInteractor @Inject constructor(
      * @return id of session stopped.
      */
     suspend fun stopSession(session: DomainSession): Long {
-        val sessionId = sessionDiskDataSource.stopSession(session)
+        val sessionId = sessionRoomDataSource.stopSession(session)
         refreshDistanceForSession(session)
         refreshSessionEndLocation(session)
         return sessionId
@@ -352,14 +350,14 @@ class SessionInteractor @Inject constructor(
     suspend fun refreshSessionStartLocation(
         session: DomainSession,
     ) {
-        locationDiskDataSource.getLocations(session.uuid).first { locations ->
+        locationRoomDataSource.getLocations(session.uuid).first { locations ->
             val startLocationLatLng = locations.minByOrNull {
                 it.zonedDateTime.toInstant().toEpochMilli()
             }?.latLng
             session.startLocation = startLocationLatLng
             startLocationLatLng?.let {
                 coroutineScopeIO.launch {
-                    sessionDiskDataSource.saveStartLocationForSession(
+                    sessionRoomDataSource.saveStartLocationForSession(
                         session.uuid,
                         startLocationLatLng
                     )
@@ -380,7 +378,7 @@ class SessionInteractor @Inject constructor(
                         session.startLocationName = it.address?.place
                         session.startLocationName?.let {
                             coroutineScopeIO.launch {
-                                sessionDiskDataSource.saveStartLocationNameForSession(
+                                sessionRoomDataSource.saveStartLocationNameForSession(
                                     session.uuid,
                                     it
                                 )
@@ -396,7 +394,7 @@ class SessionInteractor @Inject constructor(
     suspend fun refreshSessionEndLocation(
         session: DomainSession,
     ) {
-        locationDiskDataSource.getLocations(session.uuid).first { locations ->
+        locationRoomDataSource.getLocations(session.uuid).first { locations ->
             val endLocation = locations.maxByOrNull {
                 it.zonedDateTime.toInstant().toEpochMilli()
             }
@@ -405,7 +403,7 @@ class SessionInteractor @Inject constructor(
             if (session.endDateTime == null) session.endDateTime = endLocation?.zonedDateTime
             endLocationLatLng?.let {
                 coroutineScopeIO.launch {
-                    sessionDiskDataSource.saveEndLocationForSession(
+                    sessionRoomDataSource.saveEndLocationForSession(
                         session.uuid,
                         endLocationLatLng
                     )
@@ -426,7 +424,7 @@ class SessionInteractor @Inject constructor(
                         session.endLocationName = it.address?.place
                         session.endLocationName?.let {
                             coroutineScopeIO.launch {
-                                sessionDiskDataSource.saveEndLocationNameForSession(
+                                sessionRoomDataSource.saveEndLocationNameForSession(
                                     session.uuid,
                                     it
                                 )
@@ -460,7 +458,7 @@ class SessionInteractor @Inject constructor(
     }
 
     suspend fun refreshDistanceForSessions(sessions: List<DomainSession>) {
-        locationDiskDataSource.getLocations(sessions.map { it.uuid }).first { locations ->
+        locationRoomDataSource.getLocations(sessions.map { it.uuid }).first { locations ->
             sessions.forEach {
                 it.distance = locations.sphericalPathLength().toFloat()
             }
@@ -470,9 +468,9 @@ class SessionInteractor @Inject constructor(
     }
 
     suspend fun refreshDistanceForSession(session: DomainSession) {
-        locationDiskDataSource.getLocations(session.uuid).first { locations ->
+        locationRoomDataSource.getLocations(session.uuid).first { locations ->
             coroutineScopeIO.launch {
-                sessionDiskDataSource.saveDistanceForSession(
+                sessionRoomDataSource.saveDistanceForSession(
                     session.uuid,
                     locations.sphericalPathLength().toFloat()
                 )
@@ -485,12 +483,12 @@ class SessionInteractor @Inject constructor(
 
     fun ownSessions(sessionUUIDs: List<String>) {
         if (!authInteractor.isUserSignedIn) return
-        sessionDiskDataSource.ownSessions(sessionUUIDs, authInteractor.userUUID!!)
+        sessionRoomDataSource.ownSessions(sessionUUIDs, authInteractor.userUUID!!)
     }
 
     fun ownAllNotOwnedSessions() {
         if (!authInteractor.isUserSignedIn) return
-        sessionDiskDataSource.ownAllNotOwnedSessions(authInteractor.userUUID!!)
+        sessionRoomDataSource.ownAllNotOwnedSessions(authInteractor.userUUID!!)
     }
 
     fun deleteSessionLocally(sessionUUID: String) = deleteSessionsLocally(listOf(sessionUUID))
@@ -501,10 +499,10 @@ class SessionInteractor @Inject constructor(
             getSessions(sessionUUIDs).first {  sessions ->
                 val stoppedSessions = sessions.filter { session -> session.endDateTime != null }
                 stoppedSessions.forEach { session ->
-                    sensorEventDiskDataSource.deleteSensorEventsForSession(session.uuid)
-                    locationDiskDataSource.deleteLocationForSession(session.uuid)
+                    sensorEventRoomDataSource.deleteSensorEventsForSession(session.uuid)
+                    locationRoomDataSource.deleteLocationForSession(session.uuid)
                 }
-                sessionDiskDataSource.deleteSessions(stoppedSessions)
+                sessionRoomDataSource.deleteSessions(stoppedSessions)
                 true
             }
         }
@@ -515,10 +513,10 @@ class SessionInteractor @Inject constructor(
     fun deleteSessionsLocally(domainSessions: List<DomainSession>) {
         val stoppedSessions = domainSessions.filter { session -> session.endDateTime != null }
         stoppedSessions.forEach { session ->
-            sensorEventDiskDataSource.deleteSensorEventsForSession(session.uuid)
-            locationDiskDataSource.deleteLocationForSession(session.uuid)
+            sensorEventRoomDataSource.deleteSensorEventsForSession(session.uuid)
+            locationRoomDataSource.deleteLocationForSession(session.uuid)
         }
-        sessionDiskDataSource.deleteSessions(stoppedSessions)
+        sessionRoomDataSource.deleteSessions(stoppedSessions)
     }
 
     suspend fun deleteSessionFromCloud(sessionUUID: String) = deleteSessionsFromCloud(listOf(sessionUUID))
@@ -527,12 +525,12 @@ class SessionInteractor @Inject constructor(
     suspend fun deleteSessionsFromCloud(sessionUUIDs: List<String>) {
         Timber.d("Batch created to delete ${sessionUUIDs.size} sessions from cloud")
         firestore.runBatch(2) { batch, onOperationFinished ->
-            sessionNetworkDataSource.deleteSessions(
+            sessionFirestoreDataSource.deleteSessions(
                 batch = batch,
                 sessionUUIDs = sessionUUIDs,
                 onWriteFinished = onOperationFinished
             )
-            locationNetworkDataSource.deleteLocationsForSessions(
+            pathFirestoreDataSource.deleteLocationsForSessions(
                 batch = batch,
                 sessionUUIDs = sessionUUIDs,
                 onWriteFinished = onOperationFinished
@@ -551,7 +549,7 @@ class SessionInteractor @Inject constructor(
      * their endTime properties not null.
      */
     suspend fun deleteStoppedSessions() {
-        sessionDiskDataSource.getStoppedSessions(authInteractor.userUUID).first { sessions ->
+        sessionRoomDataSource.getStoppedSessions(authInteractor.userUUID).first { sessions ->
             Timber.i("${authInteractor.userUUID} deleting stopped sessions: ${sessions.map { it.uuid.take(4) }}")
             deleteSessionsLocally(sessions)
             true
@@ -560,7 +558,7 @@ class SessionInteractor @Inject constructor(
 
     suspend fun deleteOwnedSessions() {
         authInteractor.userUUID?.let { ownerUUID ->
-            sessionDiskDataSource.getSessionsByOwner(ownerUUID).first { sessions ->
+            sessionRoomDataSource.getSessionsByOwner(ownerUUID).first { sessions ->
                 Timber.i("${authInteractor.userUUID} deleting (all of its) owned sessions: ${sessions.map { it.uuid.take(4) }}")
                 deleteSessionsLocally(sessions)
                 true
@@ -569,7 +567,7 @@ class SessionInteractor @Inject constructor(
     }
 
     suspend fun deleteNotOwnedSessions() {
-        sessionDiskDataSource.getAllNotOwnedSessions().first { sessions ->
+        sessionRoomDataSource.getAllNotOwnedSessions().first { sessions ->
             Timber.i("Deleting all not owned sessions: ${sessions.map { it.uuid.take(4) }}")
             deleteSessionsLocally(sessions)
             true
diff --git a/app/src/main/java/illyan/jay/domain/interactor/SettingsInteractor.kt b/app/src/main/java/illyan/jay/domain/interactor/SettingsInteractor.kt
index 64182959..9d99aca6 100644
--- a/app/src/main/java/illyan/jay/domain/interactor/SettingsInteractor.kt
+++ b/app/src/main/java/illyan/jay/domain/interactor/SettingsInteractor.kt
@@ -20,12 +20,13 @@ package illyan.jay.domain.interactor
 
 import androidx.datastore.core.DataStore
 import illyan.jay.data.DataStatus
-import illyan.jay.data.disk.datasource.PreferencesDiskDataSource
-import illyan.jay.data.disk.model.AppSettings
-import illyan.jay.data.network.datasource.PreferencesNetworkDataSource
+import illyan.jay.data.datastore.model.AppSettings
+import illyan.jay.data.firestore.datasource.PreferencesFirestoreDataSource
+import illyan.jay.data.room.datasource.PreferencesRoomDataSource
 import illyan.jay.di.CoroutineScopeIO
 import illyan.jay.domain.model.DomainPreferences
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -41,12 +42,13 @@ import java.time.ZonedDateTime
 import java.util.UUID
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlin.coroutines.cancellation.CancellationException
 
 @Singleton
 class SettingsInteractor @Inject constructor(
     private val appSettingsDataStore: DataStore<AppSettings>,
-    private val preferencesNetworkDataSource: PreferencesNetworkDataSource,
-    private val preferencesDiskDataSource: PreferencesDiskDataSource,
+    private val preferencesFirestoreDataSource: PreferencesFirestoreDataSource,
+    private val preferencesRoomDataSource: PreferencesRoomDataSource,
     private val authInteractor: AuthInteractor,
     @CoroutineScopeIO private val coroutineScopeIO: CoroutineScope
 ) {
@@ -67,7 +69,7 @@ class SettingsInteractor @Inject constructor(
             if (value != null && isLoading.value == false) {
                 coroutineScopeIO.launch {
                     if (authInteractor.isUserSignedIn) {
-                        preferencesDiskDataSource.setFreeDriveAutoStart(authInteractor.userUUID!!, value)
+                        preferencesRoomDataSource.setFreeDriveAutoStart(authInteractor.userUUID!!, value)
                     } else {
                         updateAppPreferences { it.copy(freeDriveAutoStart = value) }
                     }
@@ -82,10 +84,15 @@ class SettingsInteractor @Inject constructor(
             if (value != null && isLoading.value == false) {
                 coroutineScopeIO.launch {
                     if (authInteractor.isUserSignedIn) {
-                        preferencesDiskDataSource.setAnalyticsEnabled(authInteractor.userUUID!!, value)
+                        Timber.v("Setting Analytics $value for signed in user")
+                        preferencesRoomDataSource.setAnalyticsEnabled(authInteractor.userUUID!!, value)
                     } else {
+                        Timber.v("Setting Analytics $value for offline user")
                         updateAppPreferences {
-                            it.copy(analyticsEnabled = value)
+                            it.copy(
+                                analyticsEnabled = value,
+                                lastUpdateToAnalytics = ZonedDateTime.now()
+                            )
                         }
                     }
                 }
@@ -99,7 +106,7 @@ class SettingsInteractor @Inject constructor(
             if (value != null && isLoading.value == false) {
                 coroutineScopeIO.launch {
                     if (authInteractor.isUserSignedIn) {
-                        preferencesDiskDataSource.setShowAds(authInteractor.userUUID!!, value)
+                        preferencesRoomDataSource.setShowAds(authInteractor.userUUID!!, value)
                     } else {
                         updateAppPreferences {
                             it.copy(showAds = value)
@@ -116,7 +123,7 @@ class SettingsInteractor @Inject constructor(
             if (value != null && isLoading.value == false) {
                 coroutineScopeIO.launch {
                     if (authInteractor.isUserSignedIn) {
-                        preferencesDiskDataSource.setShouldSync(authInteractor.userUUID!!, value)
+                        preferencesRoomDataSource.setShouldSync(authInteractor.userUUID!!, value)
                     }
                 }
             }
@@ -159,44 +166,25 @@ class SettingsInteractor @Inject constructor(
     private val _localUserPreferences = MutableStateFlow<DomainPreferences?>(null)
     val localUserPreferences = _localUserPreferences.asStateFlow()
 
-
     private val _isLocalLoading = MutableStateFlow<Boolean?>(null)
     val isLocalLoading: StateFlow<Boolean?> = _isLocalLoading.asStateFlow()
 
-    val cloudPreferencesStatus = preferencesNetworkDataSource.cloudPreferencesStatus
+    val cloudPreferencesStatus = preferencesFirestoreDataSource.cloudPreferencesStatus
 
     val isLoading = combine(
         cloudPreferencesStatus,
         isLocalLoading
-    ) { status, loadingFromDisk ->
-        if (status.isLoading == null && loadingFromDisk == null) {
+    ) { cloudStatus, loadingFromDisk ->
+        if (cloudStatus.isLoading == null && loadingFromDisk == null) {
             null
         } else {
-            status.isLoading == true || loadingFromDisk == true
+            cloudStatus.isLoading == true || loadingFromDisk == true
         }
     }.stateIn(coroutineScopeIO, SharingStarted.Eagerly, null)
 
     init {
-        _isLocalLoading.value = true
         coroutineScopeIO.launch {
-            authInteractor.userUUIDStateFlow.collectLatest { uuid ->
-                if (uuid != null) { // User signed in
-                    coroutineScopeIO.launch {
-                        preferencesDiskDataSource.getPreferences(uuid).collectLatest {
-                            _localUserPreferences.value = it
-                            if (_isLocalLoading.value != false) _isLocalLoading.update { false }
-                        }
-                    }
-                } else { // Offline user
-                    // Simple, we only use the baseline preferences for offline users
-                    coroutineScopeIO.launch {
-                        appSettingsFlow.collectLatest {
-                            _localUserPreferences.value = it.preferences
-                            if (_isLocalLoading.value != false) _isLocalLoading.update { false }
-                        }
-                    }
-                }
-            }
+            refreshLocalPreferences()
         }
     }
 
@@ -282,18 +270,18 @@ class SettingsInteractor @Inject constructor(
                     // User don't have local nor synced preferences? Create and upload local preferences.
                     Timber.v("User doesn't have local nor synced preferences, create and upload one")
                     val freshPreferences = DomainPreferences(userUUID = authInteractor.userUUID)
-                    preferencesDiskDataSource.upsertPreferences(freshPreferences)
-                    preferencesNetworkDataSource.setPreferences(freshPreferences)
+                    preferencesRoomDataSource.upsertPreferences(freshPreferences)
+                    preferencesFirestoreDataSource.setPreferences(freshPreferences)
                     null
                 } else if (localPreferences == null && syncedPreferences != null) {
                     // User don't have local but have synced Preferences? Use synced preferences.
                     Timber.v("User doesn't have local but have synced preferences, save synced preferences")
-                    preferencesDiskDataSource.upsertPreferences(syncedPreferences)
+                    preferencesRoomDataSource.upsertPreferences(syncedPreferences)
                     syncedPreferences
                 } else if (localPreferences != null && localPreferences.shouldSync && syncedPreferences == null) {
                     // User have local but not synced preferences? Upload local preferences.
                     Timber.v("User has local preferences which need to be synced but has no preferences in cloud, upload local preferences")
-                    preferencesNetworkDataSource.setPreferences(localPreferences)
+                    preferencesFirestoreDataSource.setPreferences(localPreferences)
                     localPreferences
                 } else { // Both sessions are now loaded in and not null
                     if (!localPreferences!!.shouldSync) {
@@ -306,12 +294,12 @@ class SettingsInteractor @Inject constructor(
                         } else if (localPreferences.isAfter(syncedPreferences)) {
                             // If local is more fresh, then update synced preferences.
                             Timber.v("Local preferences are more fresh, uploading it to cloud")
-                            preferencesNetworkDataSource.setPreferences(localPreferences)
+                            preferencesFirestoreDataSource.setPreferences(localPreferences)
                             localPreferences
                         } else {
                             // If synced is more fresh, then update local preferences.
                             Timber.v("Synced preferences are more fresh, saving it onto disk")
-                            preferencesDiskDataSource.upsertPreferences(syncedPreferences)
+                            preferencesRoomDataSource.upsertPreferences(syncedPreferences)
                             syncedPreferences
                         }
                     }
@@ -323,6 +311,33 @@ class SettingsInteractor @Inject constructor(
         }
     }
 
+    private suspend fun refreshLocalPreferences() {
+        _isLocalLoading.update { true }
+        Timber.v("Refreshing local user preferences data collection")
+        var dataCollectionJob: Job? = null
+        authInteractor.userUUIDStateFlow.collectLatest { uuid ->
+            dataCollectionJob?.cancel(CancellationException("User Authentication changed, need to cancel jobs depending on User Authentication"))
+            if (uuid != null) { // User signed in
+                Timber.v("Collecting signed in user preferences from disk")
+                dataCollectionJob = coroutineScopeIO.launch {
+                    preferencesRoomDataSource.getPreferences(uuid).collectLatest { preferences ->
+                        _localUserPreferences.update { preferences }
+                        _isLocalLoading.update { false }
+                    }
+                }
+            } else { // Offline user
+                Timber.v("Collecting offline user preferences from disk")
+                // Simple, we only use the baseline preferences for offline users
+                dataCollectionJob = coroutineScopeIO.launch {
+                    appSettingsFlow.collectLatest { settings ->
+                        _localUserPreferences.update { settings.preferences }
+                        _isLocalLoading.update { false }
+                    }
+                }
+            }
+        }
+    }
+
     suspend fun updateAppSettings(transform: (AppSettings) -> AppSettings) {
         appSettingsDataStore.updateData {
             val newSettings = transform(it)
diff --git a/app/src/main/java/illyan/jay/domain/interactor/UserInteractor.kt b/app/src/main/java/illyan/jay/domain/interactor/UserInteractor.kt
index 3c732064..9c889b68 100644
--- a/app/src/main/java/illyan/jay/domain/interactor/UserInteractor.kt
+++ b/app/src/main/java/illyan/jay/domain/interactor/UserInteractor.kt
@@ -19,7 +19,7 @@
 package illyan.jay.domain.interactor
 
 import com.google.firebase.firestore.FirebaseFirestore
-import illyan.jay.data.network.datasource.UserNetworkDataSource
+import illyan.jay.data.firestore.datasource.UserFirestoreDataFlow
 import illyan.jay.util.runBatch
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -32,7 +32,7 @@ import javax.inject.Singleton
 class UserInteractor @Inject constructor(
     private val authInteractor: AuthInteractor,
     private val settingsInteractor: SettingsInteractor,
-    private val userNetworkDataSource: UserNetworkDataSource,
+    private val userFirestoreDataFlow: UserFirestoreDataFlow,
     private val sessionInteractor: SessionInteractor,
     private val firestore: FirebaseFirestore,
 ) {
@@ -57,7 +57,7 @@ class UserInteractor @Inject constructor(
                 )
                 settingsInteractor.localUserPreferences.first {
                     if (it?.shouldSync == false) {
-                        userNetworkDataSource.deleteUserData(
+                        userFirestoreDataFlow.deleteData(
                             batch = batch,
                             onWriteFinished = onOperationFinished
                         )
diff --git a/app/src/main/java/illyan/jay/domain/model/DomainPreferences.kt b/app/src/main/java/illyan/jay/domain/model/DomainPreferences.kt
index a70b7139..e72272be 100644
--- a/app/src/main/java/illyan/jay/domain/model/DomainPreferences.kt
+++ b/app/src/main/java/illyan/jay/domain/model/DomainPreferences.kt
@@ -18,6 +18,7 @@
 
 package illyan.jay.domain.model
 
+import illyan.jay.data.serializers.ZonedDateTimeNullableSerializer
 import illyan.jay.data.serializers.ZonedDateTimeSerializer
 import kotlinx.serialization.Serializable
 import java.time.ZonedDateTime
@@ -31,14 +32,16 @@ data class DomainPreferences(
     val showAds: Boolean = false,
     @Serializable(with = ZonedDateTimeSerializer::class)
     val lastUpdate: ZonedDateTime = ZonedDateTime.now(),
+    @Serializable(with = ZonedDateTimeNullableSerializer::class)
+    val lastUpdateToAnalytics: ZonedDateTime? = null,
     val shouldSync: Boolean = false,
 ) {
     fun isBefore(other: DomainPreferences): Boolean {
-        return lastUpdate.toInstant().epochSecond < other.lastUpdate.toInstant().epochSecond
+        return lastUpdate.toInstant().toEpochMilli() < other.lastUpdate.toInstant().toEpochMilli()
     }
 
     fun isAfter(other: DomainPreferences): Boolean {
-        return lastUpdate.toInstant().epochSecond > other.lastUpdate.toInstant().epochSecond
+        return lastUpdate.toInstant().toEpochMilli() > other.lastUpdate.toInstant().toEpochMilli()
     }
 
     companion object {
diff --git a/app/src/main/java/illyan/jay/service/JayService.kt b/app/src/main/java/illyan/jay/service/JayService.kt
index a5613a77..88a655f0 100644
--- a/app/src/main/java/illyan/jay/service/JayService.kt
+++ b/app/src/main/java/illyan/jay/service/JayService.kt
@@ -23,7 +23,7 @@ import android.hardware.Sensor
 import android.hardware.SensorManager
 import androidx.core.graphics.drawable.IconCompat
 import dagger.hilt.android.AndroidEntryPoint
-import illyan.jay.data.disk.model.SensorOptions
+import illyan.jay.data.room.model.SensorOptions
 import illyan.jay.domain.interactor.SensorInteractor
 import illyan.jay.domain.interactor.SessionInteractor
 import illyan.jay.service.listener.JaySensorEventListener
diff --git a/app/src/main/java/illyan/jay/service/listener/JaySensorEventListener.kt b/app/src/main/java/illyan/jay/service/listener/JaySensorEventListener.kt
index ea8226a0..0af7e9b8 100644
--- a/app/src/main/java/illyan/jay/service/listener/JaySensorEventListener.kt
+++ b/app/src/main/java/illyan/jay/service/listener/JaySensorEventListener.kt
@@ -19,7 +19,7 @@
 package illyan.jay.service.listener
 
 import android.hardware.SensorEvent
-import illyan.jay.data.disk.toDomainModel
+import illyan.jay.data.room.toDomainModel
 import illyan.jay.di.CoroutineScopeIO
 import illyan.jay.domain.interactor.SensorEventInteractor
 import illyan.jay.domain.interactor.SessionInteractor
diff --git a/app/src/main/java/illyan/jay/service/listener/LocationEventListener.kt b/app/src/main/java/illyan/jay/service/listener/LocationEventListener.kt
index c59dcf95..5a04cf81 100644
--- a/app/src/main/java/illyan/jay/service/listener/LocationEventListener.kt
+++ b/app/src/main/java/illyan/jay/service/listener/LocationEventListener.kt
@@ -23,7 +23,7 @@ import com.google.android.gms.location.LocationCallback
 import com.google.android.gms.location.LocationRequest
 import com.google.android.gms.location.LocationResult
 import com.google.android.gms.location.Priority
-import illyan.jay.data.disk.toDomainModel
+import illyan.jay.data.room.toDomainModel
 import illyan.jay.di.CoroutineScopeIO
 import illyan.jay.domain.interactor.LocationInteractor
 import illyan.jay.domain.interactor.SessionInteractor
diff --git a/app/src/main/java/illyan/jay/ui/about/About.kt b/app/src/main/java/illyan/jay/ui/about/About.kt
index 50d40544..7389aef6 100644
--- a/app/src/main/java/illyan/jay/ui/about/About.kt
+++ b/app/src/main/java/illyan/jay/ui/about/About.kt
@@ -76,7 +76,7 @@ import illyan.jay.ui.components.PreviewThemesScreensFonts
 import illyan.jay.ui.destinations.LibrariesDialogScreenDestination
 import illyan.jay.ui.profile.MenuButton
 import illyan.jay.ui.profile.ProfileNavGraph
-import illyan.jay.ui.settings.general.ShowAdsSetting
+import illyan.jay.ui.settings.user.ShowAdsSetting
 import illyan.jay.ui.theme.JayTheme
 import illyan.jay.ui.theme.signaturePink
 import illyan.jay.util.TestAdUnitIds
diff --git a/app/src/main/java/illyan/jay/ui/components/AvatarAsyncImage.kt b/app/src/main/java/illyan/jay/ui/components/AvatarAsyncImage.kt
index 31d75ae5..410717a3 100644
--- a/app/src/main/java/illyan/jay/ui/components/AvatarAsyncImage.kt
+++ b/app/src/main/java/illyan/jay/ui/components/AvatarAsyncImage.kt
@@ -77,9 +77,9 @@ fun DefaultAvatar(
     if (LocalInspectionMode.current) {
         Image(
             modifier = modifier,
-            painter = painterResource(id = R.drawable.ic_illyan_avatar_color),
+            painter = painterResource(R.drawable.ic_illyan_avatar_color),
             contentDescription = stringResource(R.string.avatar_profile_picture),
-            contentScale = ContentScale.Crop
+            contentScale = ContentScale.Fit
         )
     } else {
         Icon(
diff --git a/app/src/main/java/illyan/jay/ui/components/JayDialogContent.kt b/app/src/main/java/illyan/jay/ui/components/JayDialogContent.kt
index 6bbd5555..899b4289 100644
--- a/app/src/main/java/illyan/jay/ui/components/JayDialogContent.kt
+++ b/app/src/main/java/illyan/jay/ui/components/JayDialogContent.kt
@@ -20,8 +20,10 @@ package illyan.jay.ui.components
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.AlertDialogDefaults
@@ -46,10 +48,10 @@ import androidx.compose.ui.unit.dp
 fun JayDialogContent(
     modifier: Modifier = Modifier,
     textModifier: Modifier = Modifier.heightIn(max = (LocalConfiguration.current.screenHeightDp * 0.66f).dp),
-    icon: @Composable (() -> Unit)? = null,
-    title: @Composable (() -> Unit)? = null,
-    text: @Composable (() -> Unit)? = null,
-    buttons: @Composable (() -> Unit)? = null,
+    icon: @Composable (BoxScope.() -> Unit)? = null,
+    title: @Composable (BoxScope.() -> Unit)? = null,
+    text: @Composable (BoxScope.() -> Unit)? = null,
+    buttons: @Composable (BoxScope.() -> Unit)? = null,
     dialogPaddingValues: PaddingValues = JayDialogContentPadding,
     iconPaddingValues: PaddingValues = JayDialogIconPadding,
     titlePaddingValues: PaddingValues = JayDialogTitlePadding,
@@ -82,6 +84,7 @@ fun JayDialogContent(
                     CompositionLocalProvider(LocalContentColor provides iconContentColor) {
                         Box(
                             Modifier
+                                .fillMaxWidth()
                                 .padding(iconPaddingValues)
                                 .align(Alignment.CenterHorizontally)
                         ) {
@@ -98,6 +101,7 @@ fun JayDialogContent(
                             Box(
                                 // Align the title to the center when an icon is present.
                                 Modifier
+                                    .fillMaxWidth()
                                     .padding(titlePaddingValues)
                                     .align(
                                         if (icon == null) {
@@ -120,6 +124,7 @@ fun JayDialogContent(
                         ProvideTextStyle(textStyle) {
                             Box(
                                 textModifier
+                                    .fillMaxWidth()
                                     .weight(weight = 1f, fill = false)
                                     .padding(textPaddingValues)
                                     .align(Alignment.Start)
@@ -132,10 +137,16 @@ fun JayDialogContent(
             }
             AnimatedVisibility(visible = buttons != null) {
                 buttons?.let {
-                    Box(modifier = Modifier.align(Alignment.End)) {
-                        CompositionLocalProvider(LocalContentColor provides buttonContentColor) {
-                            val textStyle = MaterialTheme.typography.labelLarge
-                            ProvideTextStyle(value = textStyle, content = buttons)
+                    CompositionLocalProvider(LocalContentColor provides buttonContentColor) {
+                        val textStyle = MaterialTheme.typography.labelLarge
+                        ProvideTextStyle(value = textStyle) {
+                            Box(
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .align(Alignment.End)
+                            ) {
+                                buttons()
+                            }
                         }
                     }
                 }
diff --git a/app/src/main/java/illyan/jay/ui/components/LoadingIndicator.kt b/app/src/main/java/illyan/jay/ui/components/LoadingIndicator.kt
new file mode 100644
index 00000000..ecf8a982
--- /dev/null
+++ b/app/src/main/java/illyan/jay/ui/components/LoadingIndicator.kt
@@ -0,0 +1,37 @@
+package illyan.jay.ui.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import illyan.jay.R
+
+@Composable
+fun LoadingIndicator(
+    progressIndicator: @Composable () -> Unit = {
+        MediumCircularProgressIndicator()
+    },
+    leadingComposable: @Composable () -> Unit = {},
+    trailingComposable: @Composable () -> Unit = {
+        Text(text = stringResource(R.string.loading))
+    }
+) {
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.Center
+    ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(8.dp)
+        ) {
+            leadingComposable()
+            progressIndicator()
+            trailingComposable()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/illyan/jay/ui/freedrive/FreeDrive.kt b/app/src/main/java/illyan/jay/ui/freedrive/FreeDrive.kt
index 86ad526d..5a5d46e8 100644
--- a/app/src/main/java/illyan/jay/ui/freedrive/FreeDrive.kt
+++ b/app/src/main/java/illyan/jay/ui/freedrive/FreeDrive.kt
@@ -50,7 +50,7 @@ import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
 import illyan.jay.R
-import illyan.jay.data.disk.model.AppSettings
+import illyan.jay.data.datastore.model.AppSettings
 import illyan.jay.ui.components.PreviewThemesScreensFonts
 import illyan.jay.ui.home.RoundedCornerRadius
 import illyan.jay.ui.home.absoluteBottom
@@ -64,7 +64,7 @@ import illyan.jay.ui.map.turnOnWithDefaultPuck
 import illyan.jay.ui.menu.MenuItemPadding
 import illyan.jay.ui.menu.MenuNavGraph
 import illyan.jay.ui.menu.SheetScreenBackPressHandler
-import illyan.jay.ui.settings.general.BooleanSetting
+import illyan.jay.ui.settings.user.BooleanSetting
 import illyan.jay.ui.theme.JayTheme
 import illyan.jay.util.plus
 
diff --git a/app/src/main/java/illyan/jay/ui/freedrive/FreeDriveViewModel.kt b/app/src/main/java/illyan/jay/ui/freedrive/FreeDriveViewModel.kt
index baecfd8f..17b2e68d 100644
--- a/app/src/main/java/illyan/jay/ui/freedrive/FreeDriveViewModel.kt
+++ b/app/src/main/java/illyan/jay/ui/freedrive/FreeDriveViewModel.kt
@@ -33,7 +33,7 @@ import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.ui.maps.camera.NavigationCamera
 import com.mapbox.navigation.ui.maps.camera.data.MapboxNavigationViewportDataSource
 import dagger.hilt.android.lifecycle.HiltViewModel
-import illyan.jay.data.disk.model.AppSettings
+import illyan.jay.data.datastore.model.AppSettings
 import illyan.jay.di.CoroutineDispatcherIO
 import illyan.jay.domain.interactor.MapboxInteractor
 import illyan.jay.domain.interactor.ServiceInteractor
diff --git a/app/src/main/java/illyan/jay/ui/login/Login.kt b/app/src/main/java/illyan/jay/ui/login/Login.kt
index 6cc5793e..2082e0ad 100644
--- a/app/src/main/java/illyan/jay/ui/login/Login.kt
+++ b/app/src/main/java/illyan/jay/ui/login/Login.kt
@@ -18,8 +18,10 @@
 
 package illyan.jay.ui.login
 
+import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.Button
@@ -36,6 +38,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -43,6 +46,7 @@ import com.ramcosta.composedestinations.annotation.Destination
 import illyan.jay.R
 import illyan.jay.ui.components.JayDialogContent
 import illyan.jay.ui.components.JayDialogSurface
+import illyan.jay.ui.components.LoadingIndicator
 import illyan.jay.ui.components.PreviewThemesScreensFonts
 import illyan.jay.ui.profile.LocalDialogActivityProvider
 import illyan.jay.ui.profile.LocalDialogDismissRequest
@@ -56,6 +60,7 @@ fun LoginDialogScreen(
     viewModel: LoginViewModel = hiltViewModel(),
 ) {
     val isUserSignedIn by viewModel.isUserSignedIn.collectAsStateWithLifecycle()
+    val isUserSigningIn by viewModel.isSigningIn.collectAsStateWithLifecycle()
     val activity = LocalDialogActivityProvider.current
     val dismissDialog = LocalDialogDismissRequest.current
     LaunchedEffect(isUserSignedIn) {
@@ -63,6 +68,7 @@ fun LoginDialogScreen(
     }
     LoginDialogContent(
         modifier = Modifier.fillMaxWidth(),
+        isUserSigningIn = isUserSigningIn,
         signInViaGoogle = { activity?.let { viewModel.signInViaGoogle(it) } }
     )
 }
@@ -70,20 +76,32 @@ fun LoginDialogScreen(
 @Composable
 fun LoginDialogContent(
     modifier: Modifier = Modifier,
+    isUserSigningIn: Boolean = false,
     signInViaGoogle: () -> Unit = {},
 ) {
-    JayDialogContent(
+    Crossfade(
         modifier = modifier,
-        title = { LoginTitle() },
-        text = {
-            LoginScreen(
-                modifier = Modifier.fillMaxWidth(),
-                signInViaGoogle = signInViaGoogle
+        targetState = isUserSigningIn
+    ) {
+        if (it) {
+            JayDialogContent(
+                text = { LoadingIndicator() },
+                textPaddingValues = PaddingValues()
             )
-        },
-        buttons = { LoginButtons(modifier = Modifier.fillMaxWidth()) },
-        containerColor = Color.Transparent,
-    )
+        } else {
+            JayDialogContent(
+                title = { LoginTitle() },
+                text = {
+                    LoginScreen(
+                        modifier = Modifier.fillMaxWidth(),
+                        signInViaGoogle = signInViaGoogle
+                    )
+                },
+                buttons = { LoginButtons(modifier = Modifier.fillMaxWidth()) },
+                containerColor = Color.Transparent,
+            )
+        }
+    }
 }
 
 @Composable
@@ -105,7 +123,10 @@ fun LoginScreen(
             modifier = Modifier.fillMaxWidth(),
             onClick = signInViaGoogle
         ) {
-            Text(text = stringResource(R.string.google_sign_in))
+            Text(
+                text = stringResource(R.string.google_sign_in),
+                textAlign = TextAlign.Center
+            )
         }
         // TODO: make login via email/password combo
         var email by remember { mutableStateOf("") }
diff --git a/app/src/main/java/illyan/jay/ui/login/LoginViewModel.kt b/app/src/main/java/illyan/jay/ui/login/LoginViewModel.kt
index cb59c108..1a8b0e14 100644
--- a/app/src/main/java/illyan/jay/ui/login/LoginViewModel.kt
+++ b/app/src/main/java/illyan/jay/ui/login/LoginViewModel.kt
@@ -24,6 +24,7 @@ import illyan.jay.MainActivity
 import illyan.jay.domain.interactor.AuthInteractor
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
 import javax.inject.Inject
 
 @HiltViewModel
@@ -42,7 +43,7 @@ class LoginViewModel @Inject constructor(
 
     fun signInViaGoogle(activity: MainActivity) {
         if (!isSigningIn.value) {
-            _isSigningIn.value = true
+            _isSigningIn.update { true }
             authInteractor.signInViaGoogle(activity)
         }
     }
diff --git a/app/src/main/java/illyan/jay/ui/map/Map.kt b/app/src/main/java/illyan/jay/ui/map/Map.kt
index 3bb010e5..4b499dec 100644
--- a/app/src/main/java/illyan/jay/ui/map/Map.kt
+++ b/app/src/main/java/illyan/jay/ui/map/Map.kt
@@ -49,6 +49,7 @@ import com.mapbox.maps.Style
 import com.mapbox.maps.extension.observable.eventdata.MapLoadedEventData
 import com.mapbox.maps.extension.style.expressions.dsl.generated.interpolate
 import com.mapbox.maps.plugin.LocationPuck2D
+import com.mapbox.maps.plugin.attribution.attribution
 import com.mapbox.maps.plugin.compass.compass
 import com.mapbox.maps.plugin.gestures.gestures
 import com.mapbox.maps.plugin.locationcomponent.LocationComponentPlugin
@@ -160,6 +161,9 @@ private fun MapboxMapContainer(
     ) {
         it.logo.position = 0
         it.logo.marginTop = fixedStatusBarHeight.toFloat()
+        it.attribution.position = 0
+        it.attribution.marginTop = fixedStatusBarHeight.toFloat()
+        it.attribution.marginLeft = 240f
         it.compass.marginTop = fixedStatusBarHeight.toFloat()
         it.gestures.scrollEnabled = true
         it.scalebar.isMetricUnits = true // TODO: set this in settings or based on location, etc.
diff --git a/app/src/main/java/illyan/jay/ui/menu/Menu.kt b/app/src/main/java/illyan/jay/ui/menu/Menu.kt
index b7d3d920..13adffac 100644
--- a/app/src/main/java/illyan/jay/ui/menu/Menu.kt
+++ b/app/src/main/java/illyan/jay/ui/menu/Menu.kt
@@ -144,7 +144,7 @@ fun MenuContent(
     val gridState = rememberLazyStaggeredGridState()
     LazyVerticalStaggeredGrid(
         columns = StaggeredGridCells.Adaptive(160.dp),
-        verticalArrangement = Arrangement.spacedBy(MenuItemPadding * 2),
+        verticalItemSpacing = MenuItemPadding * 2,
         horizontalArrangement = Arrangement.spacedBy(MenuItemPadding * 2),
         //contentPadding = DefaultContentPadding, // TODO: include this when finally devs fixed contentPadding on StaggeredGrids
         modifier = Modifier
diff --git a/app/src/main/java/illyan/jay/ui/session/SessionViewModel.kt b/app/src/main/java/illyan/jay/ui/session/SessionViewModel.kt
index 47b28877..1f8353b0 100644
--- a/app/src/main/java/illyan/jay/ui/session/SessionViewModel.kt
+++ b/app/src/main/java/illyan/jay/ui/session/SessionViewModel.kt
@@ -20,6 +20,7 @@ package illyan.jay.ui.session
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.google.maps.android.ktx.utils.sphericalPathLength
 import dagger.hilt.android.lifecycle.HiltViewModel
 import illyan.jay.di.CoroutineDispatcherIO
 import illyan.jay.domain.interactor.LocationInteractor
@@ -29,13 +30,18 @@ import illyan.jay.ui.session.model.UiLocation
 import illyan.jay.ui.session.model.UiSession
 import illyan.jay.ui.session.model.toUiModel
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
+import kotlin.coroutines.cancellation.CancellationException
 
 @HiltViewModel
 class SessionViewModel @Inject constructor(
@@ -43,37 +49,47 @@ class SessionViewModel @Inject constructor(
     private val locationInteractor: LocationInteractor,
     @CoroutineDispatcherIO private val dispatcherIO: CoroutineDispatcher,
 ) : ViewModel() {
-    private val _session = MutableStateFlow<UiSession?>(null)
-    val session = _session.asStateFlow()
 
     private val _path = MutableStateFlow<List<UiLocation>?>(null)
     val path = _path.asStateFlow()
 
+    private val _session = MutableStateFlow<UiSession?>(null)
+    val session = combine(
+        _session,
+        _path
+    ) { session, path ->
+        session?.copy(
+            totalDistance = path?.map { it.latLng }?.sphericalPathLength() ?: session.totalDistance
+        )
+    }.stateIn(viewModelScope, SharingStarted.Eagerly, _session.value)
+
     private val _gradientFilter = MutableStateFlow(GradientFilter.Default)
     val gradientFilter = _gradientFilter.asStateFlow()
 
+    private val jobs = mutableListOf<Job>()
+
     fun load(sessionUUID: String) {
-        viewModelScope.launch(dispatcherIO) {
+        jobs.forEach { it.cancel(CancellationException("Requested reload to data collection job, cancelling running jobs"))}
+        jobs += viewModelScope.launch(dispatcherIO) {
             Timber.d("Trying to load session with ID: $sessionUUID")
             sessionInteractor.getSession(sessionUUID).collectLatest { session ->
                 if (session != null) {
                     Timber.d("Loaded session with ID: $sessionUUID")
-                    _session.value = session.toUiModel()
-                    viewModelScope.launch(dispatcherIO) {
-                        locationInteractor.getSyncedPath(sessionUUID).collectLatest { locations ->
-                            Timber.d("Loaded path with ${locations?.size} locations for session with ID: $sessionUUID")
-                            if (!locations.isNullOrEmpty()) {
-                                val sortedPath = locations.sortedBy { it.zonedDateTime.toInstant() }
-                                _path.value = sortedPath.map { it.toUiModel() }
-                                _session.value = session.toUiModel(locations = sortedPath)
-                            }
-                        }
-                    }
+                    _session.update { session.toUiModel() }
                 } else {
                     Timber.d("Session not found (collected null)")
                 }
             }
         }
+        jobs += viewModelScope.launch(dispatcherIO) {
+            locationInteractor.getSyncedPath(sessionUUID).collectLatest { locations ->
+                Timber.d("Loaded path with ${locations?.size} locations for session with ID: $sessionUUID")
+                if (!locations.isNullOrEmpty()) {
+                    val sortedPath = locations.sortedBy { it.zonedDateTime.toInstant() }
+                    _path.update { sortedPath.map { it.toUiModel() } }
+                }
+            }
+        }
     }
 
     fun setGradientFilter(filter: GradientFilter) {
diff --git a/app/src/main/java/illyan/jay/ui/sessions/SessionsViewModel.kt b/app/src/main/java/illyan/jay/ui/sessions/SessionsViewModel.kt
index d686e3c5..7cd9ea54 100644
--- a/app/src/main/java/illyan/jay/ui/sessions/SessionsViewModel.kt
+++ b/app/src/main/java/illyan/jay/ui/sessions/SessionsViewModel.kt
@@ -29,9 +29,9 @@ import illyan.jay.domain.interactor.SettingsInteractor
 import illyan.jay.domain.model.DomainSession
 import illyan.jay.ui.sessions.model.UiSession
 import illyan.jay.ui.sessions.model.toUiModel
+import illyan.jay.util.awaitOperations
 import illyan.jay.util.sphericalPathLength
 import kotlinx.collections.immutable.persistentListOf
-import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -41,7 +41,6 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.getAndUpdate
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
@@ -49,6 +48,7 @@ import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.time.ZonedDateTime
 import javax.inject.Inject
+import kotlin.coroutines.cancellation.CancellationException
 
 @HiltViewModel
 class SessionsViewModel @Inject constructor(
@@ -165,10 +165,6 @@ class SessionsViewModel @Inject constructor(
         synced.size < owned.size - ongoing.size
     }.stateIn(viewModelScope, SharingStarted.Eagerly, false)
 
-    var ownedSessionsJob: Job? = null
-    var ongoingSessionsJob: Job? = null
-    var notOwnedSessionsJob: Job? = null
-
     fun reloadData() {
         Timber.v("Requested data reload")
         disposeSessionStateFlows()
@@ -179,58 +175,47 @@ class SessionsViewModel @Inject constructor(
     }
 
     private fun disposeJobs() {
-        val cancellationException = CancellationException("Jobs are cancelled on session data reload")
-        ownedSessionsJob?.cancel(cancellationException)
-        ongoingSessionsJob?.cancel(cancellationException)
-        notOwnedSessionsJob?.cancel(cancellationException)
+        val cancellationException = CancellationException("Requested disposing data collection jobs currently running")
+        realtimeDataCollectionJobs.forEach { it.cancel(cancellationException) }
     }
 
+    val realtimeDataCollectionJobs = mutableListOf<Job>()
     fun loadLocalSessions() {
-        _notOwnedSessionUUIDs.value = emptyList()
-        _ongoingSessionUUIDs.value = emptyList()
-        _ownedLocalSessionUUIDs.value = emptyList()
-        _localSessionsLoading.value = true
-        val loadingOwnedSessions = MutableStateFlow(true)
-        val loadingOngoingSessions = MutableStateFlow(true)
-        val loadingNotOwnedSessions = MutableStateFlow(true)
+        _notOwnedSessionUUIDs.update { emptyList() }
+        _ongoingSessionUUIDs.update { emptyList() }
+        _ownedLocalSessionUUIDs.update { emptyList() }
+        _localSessionsLoading.update { true }
 
         viewModelScope.launch(dispatcherIO) {
-            combine(
-                loadingOwnedSessions,
-                loadingNotOwnedSessions,
-                loadingOngoingSessions
-            ) { owned, notOwned, ongoing ->
-                !owned && !notOwned && !ongoing
-            }.collectLatest {
-                if (it) _localSessionsLoading.update { false }
-            }
-        }
-
-        notOwnedSessionsJob = viewModelScope.launch(dispatcherIO) {
-            sessionInteractor.getNotOwnedSessions().collectLatest { sessions ->
-                _notOwnedSessionUUIDs.value = sessions.map { it.uuid to it.startDateTime }
-                Timber.d("Got ${sessions.size} not owned sessions")
-                loadingNotOwnedSessions.update { false }
-            }
-        }
-        ongoingSessionsJob = viewModelScope.launch(dispatcherIO) {
-            sessionInteractor.getOngoingSessionUUIDs().collectLatest {
-                _ongoingSessionUUIDs.value = it
-                Timber.d("Got ${it.size} ongoing sessions")
-                loadingOngoingSessions.update { false }
-            }
-        }
-        ownedSessionsJob = viewModelScope.launch(dispatcherIO) {
-            sessionInteractor.getOwnSessions().collectLatest { sessions ->
-                _ownedLocalSessionUUIDs.value = sessions.map { it.uuid to it.startDateTime }
-                Timber.d("Got ${sessions.size} owned sessions by ${signedInUser.value?.uid?.take(4)}")
-                loadingOwnedSessions.update { false }
+            awaitOperations(3) { onOperationFinished ->
+                realtimeDataCollectionJobs += viewModelScope.launch(dispatcherIO) {
+                    sessionInteractor.getNotOwnedSessions().collectLatest { sessions ->
+                        _notOwnedSessionUUIDs.value = sessions.map { it.uuid to it.startDateTime }
+                        Timber.d("Got ${sessions.size} not owned sessions")
+                        onOperationFinished()
+                    }
+                }
+                realtimeDataCollectionJobs += viewModelScope.launch(dispatcherIO) {
+                    sessionInteractor.getOngoingSessionUUIDs().collectLatest {
+                        _ongoingSessionUUIDs.value = it
+                        Timber.d("Got ${it.size} ongoing sessions")
+                        onOperationFinished()
+                    }
+                }
+                realtimeDataCollectionJobs += viewModelScope.launch(dispatcherIO) {
+                    sessionInteractor.getOwnSessions().collectLatest { sessions ->
+                        _ownedLocalSessionUUIDs.value = sessions.map { it.uuid to it.startDateTime }
+                        Timber.d("Got ${sessions.size} owned sessions by ${signedInUser.value?.uid?.take(4)}")
+                        onOperationFinished()
+                    }
+                }
             }
+            _localSessionsLoading.update { false }
         }
     }
 
     fun loadCloudSessions() {
-        _syncedSessions.value = emptyList()
+        _syncedSessions.update { emptyList() }
         _syncedSessionsLoading.update { true }
 
         if (isUserSignedIn.value) {
@@ -283,7 +268,7 @@ class SessionsViewModel @Inject constructor(
     }
 
     fun deleteSession(uuid: String) {
-        deleteRequestedOnSessions.getAndUpdate { it.add(uuid) }
+        deleteRequestedOnSessions.update { it.add(uuid) }
         deleteSessionLocally(uuid)
         deleteSessionFromCloud(uuid)
     }
@@ -349,14 +334,16 @@ class SessionsViewModel @Inject constructor(
         viewModelScope.launch(dispatcherIO) {
             sessionInteractor.getSession(sessionUUID).collectLatest { session ->
                 if (session != null) {
-                    sessionMutableStateFlow.value = session.toUiModel(
-                        currentClientUUID = clientUUID.value,
-                        isLocal = sessionStateFlows[sessionUUID]?.value?.isLocal ?: false,
-                        isSynced = syncedSessions.value.any { it.uuid == sessionUUID }
-                    )
+                    sessionMutableStateFlow.update {
+                        session.toUiModel(
+                            currentClientUUID = clientUUID.value,
+                            isLocal = sessionStateFlows[sessionUUID]?.value?.isLocal ?: false,
+                            isSynced = syncedSessions.value.any { it.uuid == sessionUUID }
+                        )
+                    }
                 } else {
                     val remoteSession = syncedSessions.value.firstOrNull { it.uuid == sessionUUID }
-                    sessionMutableStateFlow.value = remoteSession
+                    sessionMutableStateFlow.update { remoteSession }
                     if (remoteSession != null) {
                         Timber.v("Session ${sessionUUID.take(4)} found in cloud")
                     } else {
@@ -371,19 +358,15 @@ class SessionsViewModel @Inject constructor(
                 val totalDistance = if (storingLocations) {
                     locations.sphericalPathLength()
                 } else {
-                    sessionMutableStateFlow.value?.totalDistance ?: -1.0
+                    sessionMutableStateFlow.value?.totalDistance
                 }
                 if (sessionMutableStateFlow.value != null) {
-                    sessionMutableStateFlow.value = sessionMutableStateFlow.value?.copy(
-                        totalDistance = totalDistance,
-                        isLocal = storingLocations,
-                    )
-                }
-                sessionMutableStateFlow.collectLatest { session ->
-                    sessionMutableStateFlow.value = session?.copy(
-                        totalDistance = if (storingLocations) totalDistance else session.totalDistance,
-                        isLocal = storingLocations,
-                    )
+                    sessionMutableStateFlow.update {
+                        it?.copy(
+                            totalDistance = totalDistance,
+                            isLocal = storingLocations,
+                        )
+                    }
                 }
             }
         }
diff --git a/app/src/main/java/illyan/jay/ui/sessions/model/UiSession.kt b/app/src/main/java/illyan/jay/ui/sessions/model/UiSession.kt
index d3eeed2d..4e7bd452 100644
--- a/app/src/main/java/illyan/jay/ui/sessions/model/UiSession.kt
+++ b/app/src/main/java/illyan/jay/ui/sessions/model/UiSession.kt
@@ -32,7 +32,7 @@ data class UiSession(
     val endDateTime: ZonedDateTime?,
     val startCoordinate: LatLng?,
     val endCoordinate: LatLng?,
-    val totalDistance: Double,
+    val totalDistance: Double?,
     val startLocationName: String?,
     val endLocationName: String?,
     val duration: Duration,
@@ -65,7 +65,7 @@ fun DomainSession.toUiModel(
 }
 
 fun DomainSession.toUiModel(
-    totalDistance: Double = distance?.toDouble() ?: -1.0,
+    totalDistance: Double? = distance?.toDouble(),
     currentClientUUID: String,
     isLocal: Boolean = clientUUID == currentClientUUID,
     currentTime: ZonedDateTime = ZonedDateTime.now(),
diff --git a/app/src/main/java/illyan/jay/ui/settings/data/DataSettings.kt b/app/src/main/java/illyan/jay/ui/settings/data/DataSettings.kt
index 21c3a0b8..173230fb 100644
--- a/app/src/main/java/illyan/jay/ui/settings/data/DataSettings.kt
+++ b/app/src/main/java/illyan/jay/ui/settings/data/DataSettings.kt
@@ -110,12 +110,15 @@ fun DataSettingsDialogContent(
         modifier = modifier,
         icon = {
             DataSettingsIconScreen(
+                modifier.align(Alignment.TopCenter),
                 userPhotoUrl = userPhotoUrl,
                 isUserSignedIn = isUserSignedIn,
             )
         },
         title = {
-            DataSettingsTitleScreen()
+            DataSettingsTitleScreen(
+                modifier = modifier.align(Alignment.TopCenter)
+            )
         },
         textPaddingValues = PaddingValues(),
         text = {
@@ -143,19 +146,13 @@ fun DataSettingsIconScreen(
     isUserSignedIn: Boolean = true,
     userPhotoUrl: Uri? = null
 ) {
-    Row(
-        modifier = modifier.fillMaxWidth(),
-        horizontalArrangement = Arrangement.Center
-    ) {
-        AvatarAsyncImage(
-            modifier = Modifier
-                .size(RoundedCornerRadius * 4)
-                .clip(CircleShape),
-            placeholderEnabled = !isUserSignedIn || userPhotoUrl == null,
-            userPhotoUrl = userPhotoUrl
-        )
-    }
-
+    AvatarAsyncImage(
+        modifier = modifier
+            .size(RoundedCornerRadius * 4)
+            .clip(CircleShape),
+        placeholderEnabled = !isUserSignedIn || userPhotoUrl == null,
+        userPhotoUrl = userPhotoUrl
+    )
 }
 
 @Composable
diff --git a/app/src/main/java/illyan/jay/ui/settings/general/UserSettings.kt b/app/src/main/java/illyan/jay/ui/settings/user/UserSettings.kt
similarity index 78%
rename from app/src/main/java/illyan/jay/ui/settings/general/UserSettings.kt
rename to app/src/main/java/illyan/jay/ui/settings/user/UserSettings.kt
index 9ff87246..088937e6 100644
--- a/app/src/main/java/illyan/jay/ui/settings/general/UserSettings.kt
+++ b/app/src/main/java/illyan/jay/ui/settings/user/UserSettings.kt
@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.ui.settings.general
+package illyan.jay.ui.settings.user
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.Crossfade
@@ -27,14 +27,16 @@ import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Close
 import androidx.compose.material.icons.rounded.Cloud
 import androidx.compose.material.icons.rounded.CloudOff
 import androidx.compose.material.icons.rounded.Done
+import androidx.compose.material.icons.rounded.Insights
+import androidx.compose.material3.Button
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -44,22 +46,25 @@ import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalClipboardManager
-import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.max
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.ramcosta.composedestinations.annotation.Destination
@@ -69,6 +74,7 @@ import illyan.jay.R
 import illyan.jay.ui.components.CopiedToKeyboardTooltip
 import illyan.jay.ui.components.JayDialogContent
 import illyan.jay.ui.components.JayDialogSurface
+import illyan.jay.ui.components.LoadingIndicator
 import illyan.jay.ui.components.MediumCircularProgressIndicator
 import illyan.jay.ui.components.PreviewThemesScreensFonts
 import illyan.jay.ui.components.SmallCircularProgressIndicator
@@ -76,7 +82,7 @@ import illyan.jay.ui.components.TooltipElevatedCard
 import illyan.jay.ui.destinations.DataSettingsDialogScreenDestination
 import illyan.jay.ui.profile.MenuButton
 import illyan.jay.ui.profile.ProfileNavGraph
-import illyan.jay.ui.settings.general.model.UiPreferences
+import illyan.jay.ui.settings.user.model.UiPreferences
 import illyan.jay.ui.theme.JayTheme
 import java.time.ZoneId
 import java.time.ZonedDateTime
@@ -92,19 +98,19 @@ fun UserSettingsDialogScreen(
     viewModel: UserSettingsViewModel = hiltViewModel(),
     destinationsNavigator: DestinationsNavigator = EmptyDestinationsNavigator,
 ) {
-    val screenHeightDp = LocalConfiguration.current.screenHeightDp.dp
-    val preferences by viewModel.userPreferences.collectAsStateWithLifecycle()
+    val preferences by viewModel.preferences.collectAsStateWithLifecycle()
     val arePreferencesSynced by viewModel.arePreferencesSynced.collectAsStateWithLifecycle()
     val canSyncPreferences by viewModel.canSyncPreferences.collectAsStateWithLifecycle()
     val shouldSyncPreferences by viewModel.shouldSyncPreferences.collectAsStateWithLifecycle()
+    val showAnalyticsRequestDialog by viewModel.showAnalyticsRequestDialog.collectAsStateWithLifecycle()
+
     UserSettingsDialogContent(
-        modifier = Modifier
-            .fillMaxWidth()
-            .heightIn(max = max(200.dp, screenHeightDp - 256.dp)),
+        modifier = Modifier.fillMaxWidth(),
         preferences = preferences,
         arePreferencesSynced = arePreferencesSynced,
         canSyncPreferences = canSyncPreferences,
         shouldSyncPreferences = shouldSyncPreferences,
+        showAnalyticsRequestDialog = showAnalyticsRequestDialog,
         onShouldSyncChanged = viewModel::setPreferencesSync,
         setAnalytics = viewModel::setAnalytics,
         setFreeDriveAutoStart = viewModel::setFreeDriveAutoStart,
@@ -120,41 +126,123 @@ fun UserSettingsDialogContent(
     arePreferencesSynced: Boolean = false,
     canSyncPreferences: Boolean = false,
     shouldSyncPreferences: Boolean = false,
+    showAnalyticsRequestDialog: Boolean = false,
     onShouldSyncChanged: (Boolean) -> Unit = {},
     setAnalytics: (Boolean) -> Unit = {},
     setFreeDriveAutoStart: (Boolean) -> Unit = {},
     setAdVisibility: (Boolean) -> Unit = {},
     onDeleteUserData: () -> Unit = {}
 ) {
+    Crossfade(
+        modifier = modifier.animateContentSize(),
+        targetState = showAnalyticsRequestDialog
+    ) {
+        if (it) {
+            AnalyticsRequestDialogContent(
+                analyticsEnabled = preferences?.analyticsEnabled,
+                setAnalytics = setAnalytics
+            )
+        } else {
+            JayDialogContent(
+                title = {
+                    UserSettingsTitle(
+                        arePreferencesSynced = arePreferencesSynced,
+                        preferences = preferences
+                    )
+                },
+                text = {
+                    UserSettingsScreen(
+                        preferences = preferences,
+                        setAnalytics = setAnalytics,
+                        setFreeDriveAutoStart = setFreeDriveAutoStart,
+                        setAdVisibility = setAdVisibility
+                    )
+                },
+                buttons = {
+                    UserSettingsButtons(
+                        canSyncPreferences = canSyncPreferences,
+                        shouldSyncPreferences = shouldSyncPreferences,
+                        onShouldSyncChanged = onShouldSyncChanged,
+                        onDeleteUserData = onDeleteUserData,
+                    )
+                },
+                containerColor = Color.Transparent,
+            )
+        }
+    }
+}
+
+@Composable
+fun AnalyticsRequestDialogContent(
+    modifier: Modifier = Modifier,
+    analyticsEnabled: Boolean? = null,
+    setAnalytics: (Boolean) -> Unit = {},
+) {
+    var analyticsSet by rememberSaveable { mutableStateOf(false) }
+    DisposableEffect(Unit) {
+        onDispose {
+            if (!analyticsSet) setAnalytics(analyticsEnabled ?: false)
+        }
+    }
     JayDialogContent(
         modifier = modifier,
+        icon = {
+            Icon(
+                modifier = Modifier
+                    .size(48.dp)
+                    .align(Alignment.TopCenter),
+                imageVector = Icons.Rounded.Insights,
+                contentDescription = ""
+            )
+        },
         title = {
-            UserSettingsTitle(
-                arePreferencesSynced = arePreferencesSynced,
-                preferences = preferences
+            Text(
+                modifier = Modifier.align(Alignment.TopCenter),
+                text = stringResource(R.string.turn_on_analytics),
+                textAlign = TextAlign.Center
             )
         },
         text = {
-            UserSettingsScreen(
-                preferences = preferences,
-                setAnalytics = setAnalytics,
-                setFreeDriveAutoStart = setFreeDriveAutoStart,
-                setAdVisibility = setAdVisibility
-            )
+            LazyColumn {
+                item {
+                    Text(text = stringResource(R.string.turn_on_analytics_description))
+                }
+            }
         },
         buttons = {
-            UserSettingsButtons(
-                modifier = Modifier.fillMaxWidth(),
-                canSyncPreferences = canSyncPreferences,
-                shouldSyncPreferences = shouldSyncPreferences,
-                onShouldSyncChanged = onShouldSyncChanged,
-                onDeleteUserData = onDeleteUserData,
+            AnalyticsRequestButtons(
+                modifier = Modifier.align(Alignment.BottomEnd),
+                onDismiss = {
+                    analyticsSet = true
+                    setAnalytics(false)
+                },
+                onTurnOnAnalytics = {
+                    analyticsSet = true
+                    setAnalytics(true)
+                }
             )
-        },
-        containerColor = Color.Transparent,
+        }
     )
 }
 
+@Composable
+fun AnalyticsRequestButtons(
+    modifier: Modifier = Modifier,
+    onDismiss: () -> Unit = {},
+    onTurnOnAnalytics: () -> Unit = {}
+) {
+    Row(
+        modifier = modifier
+    ) {
+        TextButton(onClick = onDismiss) {
+            Text(text = stringResource(R.string.dismiss))
+        }
+        Button(onClick = onTurnOnAnalytics) {
+            Text(text = stringResource(R.string.turn_on))
+        }
+    }
+}
+
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun UserSettingsTitle(
@@ -414,12 +502,16 @@ fun SettingLabel(
 
 @Composable
 fun UserSettingsScreen(
+    modifier: Modifier = Modifier,
     preferences: UiPreferences? = null,
     setAnalytics: (Boolean) -> Unit = {},
     setFreeDriveAutoStart: (Boolean) -> Unit = {},
     setAdVisibility: (Boolean) -> Unit = {},
 ) {
-    Crossfade(targetState = preferences != null) {
+    Crossfade(
+        modifier = modifier,
+        targetState = preferences != null
+    ) {
         if (it && preferences != null) {
             LazyColumn {
                 item {
@@ -438,18 +530,7 @@ fun UserSettingsScreen(
                 }
             }
         } else {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.Center
-            ) {
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.spacedBy(8.dp)
-                ) {
-                    Text(text = stringResource(R.string.loading))
-                    MediumCircularProgressIndicator()
-                }
-            }
+            LoadingIndicator()
         }
     }
 }
@@ -566,23 +647,28 @@ fun SettingItem(
     }
 }
 
+private fun generateRandomUserPreferences(): UiPreferences {
+    return UiPreferences(
+        userUUID = UUID.randomUUID().toString(),
+        clientUUID = UUID.randomUUID().toString(),
+        lastUpdate = ZonedDateTime.now().minusDays(if (Random.nextBoolean()) 1 else 0),
+        analyticsEnabled = Random.nextBoolean(),
+        freeDriveAutoStart = Random.nextBoolean(),
+        showAds = Random.nextBoolean(),
+    )
+}
+
 @PreviewThemesScreensFonts
 @Composable
 fun UserSettingsDialogScreenPreview() {
     JayTheme {
         JayDialogSurface {
+            val preferences = generateRandomUserPreferences()
             val canSyncPreferences = Random.nextBoolean()
             val arePreferencesSynced = if (canSyncPreferences) Random.nextBoolean() else false
             val shouldSyncPreferences = if (arePreferencesSynced) true else Random.nextBoolean()
             UserSettingsDialogContent(
-                preferences = UiPreferences(
-                    userUUID = UUID.randomUUID().toString(),
-                    clientUUID = UUID.randomUUID().toString(),
-                    lastUpdate = ZonedDateTime.now().minusDays(if (Random.nextBoolean()) 1 else 0),
-                    analyticsEnabled = Random.nextBoolean(),
-                    freeDriveAutoStart = Random.nextBoolean(),
-                    showAds = Random.nextBoolean(),
-                ),
+                preferences = preferences,
                 canSyncPreferences = canSyncPreferences,
                 arePreferencesSynced = arePreferencesSynced,
                 shouldSyncPreferences = shouldSyncPreferences
@@ -590,3 +676,16 @@ fun UserSettingsDialogScreenPreview() {
         }
     }
 }
+
+@PreviewThemesScreensFonts
+@Composable
+fun AnalyticsRequestDialogContentPreview() {
+    JayTheme {
+        JayDialogSurface {
+            val preferences = generateRandomUserPreferences()
+            AnalyticsRequestDialogContent(
+                analyticsEnabled = preferences.analyticsEnabled,
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/illyan/jay/ui/settings/general/UserSettingsViewModel.kt b/app/src/main/java/illyan/jay/ui/settings/user/UserSettingsViewModel.kt
similarity index 58%
rename from app/src/main/java/illyan/jay/ui/settings/general/UserSettingsViewModel.kt
rename to app/src/main/java/illyan/jay/ui/settings/user/UserSettingsViewModel.kt
index 6eb5654e..379deb09 100644
--- a/app/src/main/java/illyan/jay/ui/settings/general/UserSettingsViewModel.kt
+++ b/app/src/main/java/illyan/jay/ui/settings/user/UserSettingsViewModel.kt
@@ -16,17 +16,23 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.ui.settings.general
+package illyan.jay.ui.settings.user
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import illyan.jay.domain.interactor.AuthInteractor
 import illyan.jay.domain.interactor.SettingsInteractor
-import illyan.jay.ui.settings.general.model.toUiModel
+import illyan.jay.ui.settings.user.model.UiPreferences
+import illyan.jay.ui.settings.user.model.toUiModel
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
+import timber.log.Timber
+import java.time.ZonedDateTime
 import javax.inject.Inject
 
 @HiltViewModel
@@ -34,21 +40,39 @@ class UserSettingsViewModel @Inject constructor(
     private val settingsInteractor: SettingsInteractor,
     private val authInteractor: AuthInteractor
 ) : ViewModel() {
-    val userPreferences = combine(
+
+    private val _showAnalyticsRequestDialog = MutableStateFlow(false)
+    val showAnalyticsRequestDialog = _showAnalyticsRequestDialog.asStateFlow()
+
+    val preferences = combine(
         settingsInteractor.userPreferences,
         settingsInteractor.appSettingsFlow
     ) { preferences, appSettings ->
-        preferences?.toUiModel(appSettings.clientUUID)
+        val uiPreferences = preferences?.toUiModel(clientUUID = appSettings.clientUUID)
+        updateAnalyticsRequestDialogVisibility(uiPreferences)
+        uiPreferences
     }.stateIn(viewModelScope, SharingStarted.Eagerly, null)
 
     val arePreferencesSynced = settingsInteractor.arePreferencesSynced
-
     val isUserSignedIn = authInteractor.isUserSignedInStateFlow
-
     val shouldSyncPreferences = settingsInteractor.shouldSyncPreferences
-
     val canSyncPreferences = settingsInteractor.canSyncPreferences
 
+    private fun updateAnalyticsRequestDialogVisibility(uiPreferences: UiPreferences?) {
+        _showAnalyticsRequestDialog.update {
+            // If analytics has not yet been updated, show dialog,
+            // or it was turned off a while ago, show the dialog again
+            val shouldShowAnalyticsRequest = uiPreferences?.let {
+                if (it.lastUpdateToAnalytics == null) return@let true
+                val thresholdTime = it.lastUpdateToAnalytics.plusDays(DaysToWaitForRequest)
+                val isAnalyticsSetLongTimeAgo = thresholdTime < ZonedDateTime.now()
+                isAnalyticsSetLongTimeAgo && !it.analyticsEnabled
+            } ?: true
+            Timber.v("Should show Analytics Request on User Settings Screen? $shouldShowAnalyticsRequest")
+            shouldShowAnalyticsRequest
+        }
+    }
+
     fun setPreferencesSync(shouldSync: Boolean) {
         settingsInteractor.shouldSync = shouldSync
     }
@@ -64,4 +88,8 @@ class UserSettingsViewModel @Inject constructor(
     fun setAdVisibility(visible: Boolean) {
         settingsInteractor.showAds = visible
     }
+
+    companion object {
+        const val DaysToWaitForRequest = 30L // days
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/illyan/jay/ui/settings/general/model/UiPreferences.kt b/app/src/main/java/illyan/jay/ui/settings/user/model/UiPreferences.kt
similarity index 91%
rename from app/src/main/java/illyan/jay/ui/settings/general/model/UiPreferences.kt
rename to app/src/main/java/illyan/jay/ui/settings/user/model/UiPreferences.kt
index 572a19fa..1cbc6fd5 100644
--- a/app/src/main/java/illyan/jay/ui/settings/general/model/UiPreferences.kt
+++ b/app/src/main/java/illyan/jay/ui/settings/user/model/UiPreferences.kt
@@ -16,7 +16,7 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-package illyan.jay.ui.settings.general.model
+package illyan.jay.ui.settings.user.model
 
 import illyan.jay.domain.model.DomainPreferences
 import java.time.ZonedDateTime
@@ -27,6 +27,7 @@ data class UiPreferences(
     val freeDriveAutoStart: Boolean = DomainPreferences.Default.freeDriveAutoStart,
     val showAds: Boolean = DomainPreferences.Default.showAds,
     val lastUpdate: ZonedDateTime = DomainPreferences.Default.lastUpdate,
+    val lastUpdateToAnalytics: ZonedDateTime? = null,
     val clientUUID: String? = null,
 )
 
@@ -38,5 +39,6 @@ fun DomainPreferences.toUiModel(
     freeDriveAutoStart = freeDriveAutoStart,
     showAds = showAds,
     lastUpdate = lastUpdate,
+    lastUpdateToAnalytics = lastUpdateToAnalytics,
     clientUUID = clientUUID,
 )
diff --git a/app/src/main/java/illyan/jay/util/Util.kt b/app/src/main/java/illyan/jay/util/Util.kt
index e7c5e4f8..719abfbd 100644
--- a/app/src/main/java/illyan/jay/util/Util.kt
+++ b/app/src/main/java/illyan/jay/util/Util.kt
@@ -42,9 +42,12 @@ import com.google.accompanist.placeholder.material.shimmer
 import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.tasks.Task
 import com.google.firebase.Timestamp
+import com.google.firebase.firestore.DocumentReference
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.GeoPoint
+import com.google.firebase.firestore.Query
 import com.google.firebase.firestore.WriteBatch
+import com.google.firebase.firestore.ktx.snapshots
 import com.google.maps.android.SphericalUtil
 import com.google.maps.android.ktx.utils.sphericalPathLength
 import com.mapbox.geojson.Point
@@ -54,6 +57,7 @@ import illyan.jay.domain.model.DomainLocation
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.flow.first
 import timber.log.Timber
 import java.time.Instant
 import java.time.ZoneOffset
@@ -282,3 +286,12 @@ suspend fun awaitOperations(
     body(onOperationFinished)
     awaitAll(deferreds = completableDeferred.toTypedArray())
 }
+
+suspend fun WriteBatch.delete(query: Query, onOperationFinished: () -> Unit) {
+    query.snapshots().first().documents.forEach { delete(it.reference) }
+    onOperationFinished()
+}
+
+fun WriteBatch.delete(references: Collection<DocumentReference>) {
+    references.forEach { delete(it) }
+}
diff --git a/app/src/main/java/illyan/jay/util/log/CrashlyticsTree.kt b/app/src/main/java/illyan/jay/util/log/CrashlyticsTree.kt
index f26846c3..5431565f 100644
--- a/app/src/main/java/illyan/jay/util/log/CrashlyticsTree.kt
+++ b/app/src/main/java/illyan/jay/util/log/CrashlyticsTree.kt
@@ -26,7 +26,7 @@ import javax.inject.Inject
 class CrashlyticsTree @Inject constructor(
     private val crashlytics: FirebaseCrashlytics,
 ) : Timber.DebugTree() {
-    var minPriorityToLog: Int = Log.INFO
+    var minPriorityToLog: Int = Log.VERBOSE
 
     override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
         val severity = when (priority) {
@@ -36,7 +36,7 @@ class CrashlyticsTree @Inject constructor(
             Log.WARN -> "Warn"
             Log.ERROR -> "Error"
             Log.ASSERT -> "Assert"
-            else -> "Unknown severity"
+            else -> "Unknown Tag"
         }
         if (minPriorityToLog <= priority) crashlytics.log("$tag | $severity | $message")
         t?.let { crashlytics.recordException(it) }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4aa279b4..5530ab45 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -137,4 +137,7 @@
     <string name="delete_public_data_description">Delete data visible to everyone. Public data cannot be synced, nor belong to a user. This data (e.g. Session) can be owned and become the user\'s private property.</string>
     <string name="delete_from_device">Delete from device</string>
     <string name="delete_from_device_description">Deletes all user related data on-device. It does not affect data uploaded and synced to the cloud.</string>
+    <string name="turn_on_analytics">Turn On Analytics</string>
+    <string name="turn_on_analytics_description">Analytics help the development of Jay to provide a more stable and better experience. By turning on analytics, you anonymously send event data to us with Firebase Analytics, crash logs via Firebase Crashlytics and performance metrics via Firebase Performance monitoring. App restart may be required for the setting to be active.</string>
+    <string name="turn_on">Turn On</string>
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index e7daf45d..4a509321 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,30 +19,35 @@
 buildscript {
     ext {
         compose_version = '1.4.0-beta01'
+        kotlin_version = '1.8.20'
+        hilt_version = '2.45'
+        agp_version = '8.0.0'
     }
     dependencies {
         classpath 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1'
         classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3'
         classpath 'com.google.gms:google-services:4.3.15'
-        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.44.2'
+        classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'de.mannodermaus.gradle.plugins:android-junit5:1.8.2.0'
-        classpath 'org.jetbrains.kotlin:kotlin-serialization:1.8.10'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
         classpath 'com.google.firebase:perf-plugin:1.4.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
     repositories {
         google()
+        mavenCentral()
     }
 }
 
 plugins {
-    id 'com.android.application' version '7.4.1' apply false
-    id 'com.android.library' version '7.4.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
-    id 'androidx.navigation.safeargs.kotlin' version '2.5.1' apply false
+    id 'com.android.application' version "$agp_version" apply false
+    id 'com.android.library' version "$agp_version" apply false
+    id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
+    id 'androidx.navigation.safeargs.kotlin' version '2.5.3' apply false
     id 'org.sonarqube' version "3.4.0.2513"
-    id 'com.google.dagger.hilt.android' version '2.44.2' apply false
-    id 'com.android.test' version '7.4.1' apply false
+    id 'com.google.dagger.hilt.android' version "$hilt_version" apply false
+    id 'com.android.test' version "$agp_version" apply false
 }
 
 sonarqube {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2cf17ba9..730ea2de 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -16,7 +16,7 @@
 # If not, see <https://www.gnu.org/licenses/>.
 #
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
index 13c79da0..467d2955 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -21,6 +21,7 @@ pluginManagement {
         gradlePluginPortal()
         google()
         mavenCentral()
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
     }
 }
 dependencyResolutionManagement {
@@ -42,8 +43,8 @@ dependencyResolutionManagement {
             }
         }
         maven { url 'https://jitpack.io' }
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
     }
 }
 rootProject.name = "Jay"
 include ':app'
-include ':app:benchmark'