diff --git a/app/build.gradle b/app/build.gradle
index d8bec14c8..28ae802c2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -69,9 +69,9 @@ dependencies {
     // General
     // 1.4.0 is used in order to avoid a ripple bug in material components
     implementation "androidx.appcompat:appcompat:1.4.0"
-    implementation "androidx.core:core-ktx:1.8.0"
-    implementation "androidx.activity:activity-ktx:1.6.0-rc01"
-    implementation "androidx.fragment:fragment-ktx:1.5.2"
+    implementation "androidx.core:core-ktx:1.9.0"
+    implementation "androidx.activity:activity-ktx:1.6.0"
+    implementation "androidx.fragment:fragment-ktx:1.5.3"
 
     // UI
     implementation "androidx.recyclerview:recyclerview:1.2.1"
diff --git a/app/src/main/java/org/oxycblt/auxio/music/Music.kt b/app/src/main/java/org/oxycblt/auxio/music/Music.kt
index 80d301f94..ebf9c559a 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/Music.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/Music.kt
@@ -377,6 +377,7 @@ class Song constructor(raw: Raw, settings: Settings) : Music() {
     class Raw
     constructor(
         var mediaStoreId: Long? = null,
+        var mbid: UUID? = null,
         var name: String? = null,
         var sortName: String? = null,
         var displayName: String? = null,
@@ -391,11 +392,14 @@ class Song constructor(raw: Raw, settings: Settings) : Music() {
         var disc: Int? = null,
         var date: Date? = null,
         var albumMediaStoreId: Long? = null,
+        var albumMbid: UUID? = null,
         var albumName: String? = null,
         var albumSortName: String? = null,
         var albumReleaseType: List<String> = listOf(),
+        var artistMbids: List<UUID> = listOf(),
         var artistNames: List<String> = listOf(),
         var artistSortNames: List<String> = listOf(),
+        var albumArtistMbids: List<UUID> = listOf(),
         var albumArtistNames: List<String> = listOf(),
         var albumArtistSortNames: List<String> = listOf(),
         var genreNames: List<String> = listOf()
diff --git a/build.gradle b/build.gradle
index f34566fc3..d507158b2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext.kotlin_version = '1.7.10'
-    ext.navigation_version = "2.5.1"
+    ext.navigation_version = "2.5.2"
 
     repositories {
         google()