diff --git a/.editorconfig b/.editorconfig
index 36ad7bc..90b15bb 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,6 +7,7 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 max_line_length = 120
+
 [*.md]
 indent_size = 2
 trim_trailing_whitespace = false
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0d268e5..81699a6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,13 +9,13 @@
     <!-- Phone Sensors for Steps -->
     <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
 
-    <!-- Bluetooth Connection -->
+    <!-- Bluetooth Scales Connection -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
+    <!-- Application Service-->
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
         android:name=".Application"
@@ -52,12 +52,22 @@
             android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
             android:theme="@style/Theme.OpenHealth" />
 
-        <!-- the Service for the application -->
+        <receiver
+            android:name=".services.ServiceBoot"
+            android:exported="false"
+        >
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+
+        <!-- the OpenHealth Service for the application -->
         <service
             android:name=".services.OpenHealthService"
+            android:enabled="true"
             android:permission="android.permission.ACTIVITY_RECOGNITION" />
 
-        <!-- Android 13 Locales management if I remember correctly -->
+        <!-- Android 13 Locales management -->
         <service
             android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
             android:enabled="false"
diff --git a/app/src/main/java/com/dzeio/openhealth/data/AppDatabase.kt b/app/src/main/java/com/dzeio/openhealth/data/AppDatabase.kt
index 38779cd..b4183d0 100644
--- a/app/src/main/java/com/dzeio/openhealth/data/AppDatabase.kt
+++ b/app/src/main/java/com/dzeio/openhealth/data/AppDatabase.kt
@@ -13,6 +13,8 @@ import com.dzeio.openhealth.data.water.Water
 import com.dzeio.openhealth.data.water.WaterDao
 import com.dzeio.openhealth.data.weight.Weight
 import com.dzeio.openhealth.data.weight.WeightDao
+import java.io.File
+import java.io.IOException
 
 /**
  * ROOM SQLite database for the application
@@ -46,6 +48,11 @@ abstract class AppDatabase : RoomDatabase() {
          */
         private const val DATABASE_NAME = "open_health"
 
+        private const val BACKUP_DATABASE = "-bkp"
+
+        private const val SQLITE_SHMFILE_SUFFIX = "-wal"
+        private const val SQLITE_WALFILE_SUFFIX = "-shm"
+
         // For Singleton instantiation
         @Volatile
         private var instance: AppDatabase? = null
@@ -66,4 +73,57 @@ abstract class AppDatabase : RoomDatabase() {
                 .build()
         }
     }
+
+    fun backup(context: Context): Int {
+        var result = -99
+        if (instance == null) return result
+
+        val dbFile = context.getDatabasePath(DATABASE_NAME)
+        val dbWalFile = File(dbFile.path + SQLITE_WALFILE_SUFFIX)
+        val dbShmFile = File(dbFile.path + SQLITE_SHMFILE_SUFFIX)
+        val bkpFile = File(dbFile.path + BACKUP_DATABASE)
+        val bkpWalFile = File(bkpFile.path + SQLITE_WALFILE_SUFFIX)
+        val bkpShmFile = File(bkpFile.path + SQLITE_SHMFILE_SUFFIX)
+        if (bkpFile.exists()) bkpFile.delete()
+        if (bkpWalFile.exists()) bkpWalFile.delete()
+        if (bkpShmFile.exists()) bkpShmFile.delete()
+        checkpoint()
+        try {
+            dbFile.copyTo(bkpFile, true)
+            if (dbWalFile.exists()) dbWalFile.copyTo(bkpWalFile, true)
+            if (dbShmFile.exists()) dbShmFile.copyTo(bkpShmFile, true)
+            result = 0
+        } catch (e: IOException) {
+            e.printStackTrace()
+        }
+        return result
+    }
+
+    fun restore(context: Context) {
+        if (!File(context.getDatabasePath(DATABASE_NAME).path + BACKUP_DATABASE).exists()) {
+            return
+        }
+        if (instance == null) return
+        val dbpath = instance!!.openHelper.readableDatabase.path
+        val dbFile = File(dbpath)
+        val dbWalFile = File(dbFile.path + SQLITE_WALFILE_SUFFIX)
+        val dbShmFile = File(dbFile.path + SQLITE_SHMFILE_SUFFIX)
+        val bkpFile = File(dbFile.path + BACKUP_DATABASE)
+        val bkpWalFile = File(bkpFile.path + SQLITE_WALFILE_SUFFIX)
+        val bkpShmFile = File(bkpFile.path + SQLITE_SHMFILE_SUFFIX)
+        try {
+            bkpFile.copyTo(dbFile, true)
+            if (bkpWalFile.exists()) bkpWalFile.copyTo(dbWalFile, true)
+            if (bkpShmFile.exists()) bkpShmFile.copyTo(dbShmFile, true)
+            checkpoint()
+        } catch (e: IOException) {
+            e.printStackTrace()
+        }
+    }
+
+    private fun checkpoint() {
+        val db = this.openHelper.writableDatabase
+        db.query("PRAGMA wal_checkpoint(FULL);", emptyArray())
+        db.query("PRAGMA wal_checkpoint(TRUNCATE);", emptyArray())
+    }
 }
diff --git a/app/src/main/java/com/dzeio/openhealth/services/ServiceBoot.kt b/app/src/main/java/com/dzeio/openhealth/services/ServiceBoot.kt
new file mode 100644
index 0000000..29981dc
--- /dev/null
+++ b/app/src/main/java/com/dzeio/openhealth/services/ServiceBoot.kt
@@ -0,0 +1,16 @@
+package com.dzeio.openhealth.services
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import com.dzeio.openhealth.utils.ServiceUtils
+
+class ServiceBoot : BroadcastReceiver() {
+    override fun onReceive(context: Context?, intent: Intent?) {
+        if (context != null) {
+            ServiceUtils.startService(context, OpenHealthService::class.java)
+            Log.i("ServiceBoot", "started")
+        }
+    }
+}
diff --git a/app/src/main/java/com/dzeio/openhealth/ui/weight/ListWeightFragment.kt b/app/src/main/java/com/dzeio/openhealth/ui/weight/ListWeightFragment.kt
index dbeeed9..c8608ca 100644
--- a/app/src/main/java/com/dzeio/openhealth/ui/weight/ListWeightFragment.kt
+++ b/app/src/main/java/com/dzeio/openhealth/ui/weight/ListWeightFragment.kt
@@ -99,8 +99,7 @@ class ListWeightFragment :
             val permissions = arrayOf(
                 Manifest.permission.BLUETOOTH,
                 Manifest.permission.BLUETOOTH_CONNECT,
-                Manifest.permission.BLUETOOTH_SCAN,
-                Manifest.permission.ACCESS_FINE_LOCATION
+                Manifest.permission.BLUETOOTH_SCAN
             )
             val hasPermission = PermissionsManager.hasPermission(requireContext(), permissions)
             if (!hasPermission) {
@@ -142,6 +141,16 @@ class ListWeightFragment :
             }
         }
 
+        viewModel.goalWeight.observe(viewLifecycleOwner) {
+            val chart = binding.chart
+            if (it != null) {
+                chart.yAxis.addLine(
+                    it,
+                    Line(true, Paint(chart.yAxis.linePaint).apply { strokeWidth = 4f })
+                )
+            }
+        }
+
         val chart = binding.chart
 
         val serie = LineSerie(chart).apply {
@@ -223,13 +232,6 @@ class ListWeightFragment :
         }
         serie.entries = entries
 
-        if (viewModel.goalWeight.value != null) {
-            chart.yAxis.addLine(
-                viewModel.goalWeight.value!!,
-                Line(true, Paint(chart.yAxis.linePaint).apply { strokeWidth = 4f })
-            )
-        }
-
         if (list.isEmpty()) {
             chart.xAxis.x = 0.0
         } else {
diff --git a/app/src/main/java/com/dzeio/openhealth/ui/weight/ListWeightViewModel.kt b/app/src/main/java/com/dzeio/openhealth/ui/weight/ListWeightViewModel.kt
index dc47292..3e3d73e 100644
--- a/app/src/main/java/com/dzeio/openhealth/ui/weight/ListWeightViewModel.kt
+++ b/app/src/main/java/com/dzeio/openhealth/ui/weight/ListWeightViewModel.kt
@@ -10,10 +10,10 @@ import com.dzeio.openhealth.data.weight.WeightRepository
 import com.dzeio.openhealth.units.Units
 import com.dzeio.openhealth.utils.Configuration
 import dagger.hilt.android.lifecycle.HiltViewModel
-import javax.inject.Inject
-import kotlin.random.Random
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
+import javax.inject.Inject
+import kotlin.random.Random
 
 @HiltViewModel
 class ListWeightViewModel @Inject internal constructor(
@@ -24,8 +24,7 @@ class ListWeightViewModel @Inject internal constructor(
     private val _massUnit = MutableLiveData(Units.Mass.KILOGRAM)
     val massUnit: LiveData<Units.Mass> = _massUnit
 
-    private val _goalWeight = settings.getFloat(Settings.WEIGHT_GOAL)
-    val goalWeight = _goalWeight.toLiveData()
+    val goalWeight = settings.getFloat(Settings.WEIGHT_GOAL).toLiveData()
 
     private val _weights = MutableLiveData<List<Weight>?>(null)
     val weights: LiveData<List<Weight>?> = _weights
diff --git a/fastlane/metadata/android/en-GB/short_description.txt b/fastlane/metadata/android/en-GB/short_description.txt
index e69de29..3e087a6 100644
--- a/fastlane/metadata/android/en-GB/short_description.txt
+++ b/fastlane/metadata/android/en-GB/short_description.txt
@@ -0,0 +1 @@
+Your privacy-friendly FOSS Health Application