From ca15f51c85ea035052595cc6ae49bebcb94a171f Mon Sep 17 00:00:00 2001
From: antonio <antoniocappiello.play@gmail.com>
Date: Mon, 6 Mar 2023 21:59:10 +0100
Subject: [PATCH] - Removed middle layer of abstraction for subsonic classes -
 Used kotlin for classes

---
 .idea/inspectionProfiles/Project_Default.xml  |   5 +-
 .../java/com/cappielloantonio/play/App.java   |  38 +-
 .../play/adapter/AlbumAdapter.java            |  17 +-
 .../AlbumArtistPageOrSimilarAdapter.java      |  16 +-
 .../play/adapter/AlbumCatalogueAdapter.java   |  29 +-
 .../play/adapter/AlbumHorizontalAdapter.java  |  16 +-
 .../play/adapter/ArtistAdapter.java           |  23 +-
 .../play/adapter/ArtistCatalogueAdapter.java  |  25 +-
 .../play/adapter/ArtistHorizontalAdapter.java |  18 +-
 .../play/adapter/ArtistSimilarAdapter.java    |  20 +-
 .../play/adapter/DiscoverSongAdapter.java     |  10 +-
 .../play/adapter/GenreAdapter.java            |   4 +-
 .../play/adapter/GenreCatalogueAdapter.java   |  13 +-
 .../play/adapter/PlayerSongQueueAdapter.java  |  14 +-
 .../PlaylistDialogHorizontalAdapter.java      |   7 +-
 .../PlaylistDialogSongHorizontalAdapter.java  |  14 +-
 .../adapter/PlaylistHorizontalAdapter.java    |   6 +-
 .../play/adapter/PodcastEpisodeAdapter.java   |  10 +-
 .../play/adapter/SimilarTrackAdapter.java     |  11 +-
 .../play/adapter/SongHorizontalAdapter.java   |  26 +-
 .../play/database/AppDatabase.java            |  10 +-
 .../play/database/converter/DateConverters.kt |  16 +
 .../play/database/dao/DownloadDao.java        |  16 +-
 .../play/database/dao/PlaylistDao.java        |   9 +-
 .../play/glide/CustomGlideModule.java         |   4 +-
 .../play/glide/CustomGlideRequest.java        |  10 +-
 .../com/cappielloantonio/play/model/Album.kt  |  53 +-
 .../com/cappielloantonio/play/model/Artist.kt |  89 +---
 .../cappielloantonio/play/model/Chronology.kt |  46 +-
 .../cappielloantonio/play/model/Download.kt   |  83 +--
 .../com/cappielloantonio/play/model/Genre.kt  |  16 +-
 .../com/cappielloantonio/play/model/Media.kt  | 183 +------
 .../cappielloantonio/play/model/Playlist.kt   |  36 +-
 .../play/model/PodcastChannel.kt              |  34 --
 .../com/cappielloantonio/play/model/Queue.kt  |  58 +-
 .../play/repository/AlbumRepository.java      |  60 +--
 .../play/repository/ArtistRepository.java     |  74 ++-
 .../play/repository/DownloadRepository.java   |  27 +-
 .../play/repository/GenreRepository.java      |   6 +-
 .../play/repository/PlaylistRepository.java   |  17 +-
 .../play/repository/PodcastRepository.java    |  13 +-
 .../play/repository/QueueRepository.java      |  40 +-
 .../play/repository/SearchingRepository.java  |  73 +--
 .../play/repository/SongRepository.java       |  54 +-
 .../play/service/MediaManager.java            |  29 +-
 .../play/subsonic/Subsonic.java               |  11 +-
 .../play/subsonic/models/AlbumID3.kt          | 153 ++----
 .../play/subsonic/models/AlbumInfo.kt         |  81 +--
 .../play/subsonic/models/AlbumList.kt         |  38 +-
 .../play/subsonic/models/AlbumList2.kt        |  26 +-
 .../play/subsonic/models/AlbumWithSongsID3.kt |  29 +-
 .../play/subsonic/models/Artist.kt            |  79 +--
 .../play/subsonic/models/ArtistID3.kt         |  73 +--
 .../play/subsonic/models/ArtistInfo.kt        |  39 +-
 .../play/subsonic/models/ArtistInfo2.kt       |  26 +-
 .../play/subsonic/models/ArtistInfoBase.kt    |  75 +--
 .../subsonic/models/ArtistWithAlbumsID3.kt    |  29 +-
 .../play/subsonic/models/ArtistsID3.kt        |  36 +-
 .../play/subsonic/models/AudioTrack.kt        |  48 +-
 .../play/subsonic/models/Bookmark.kt          |  88 +--
 .../play/subsonic/models/Bookmarks.kt         |  39 +-
 .../play/subsonic/models/Captions.kt          |  34 +-
 .../play/subsonic/models/ChatMessage.kt       |  44 +-
 .../play/subsonic/models/ChatMessages.kt      |  38 +-
 .../play/subsonic/models/Child.kt             | 401 ++++----------
 .../play/subsonic/models/Directory.kt         | 271 ++++------
 .../play/subsonic/models/Error.kt             |  35 +-
 .../play/subsonic/models/ErrorCode.kt         |  33 +-
 .../play/subsonic/models/Genre.kt             |  47 +-
 .../play/subsonic/models/Genres.kt            |  26 +-
 .../play/subsonic/models/Index.kt             |  60 +--
 .../play/subsonic/models/IndexID3.kt          |  36 +-
 .../play/subsonic/models/Indexes.kt           | 134 +----
 .../subsonic/models/InternetRadioStation.kt   |  62 +--
 .../subsonic/models/InternetRadioStations.kt  |  39 +-
 .../play/subsonic/models/JukeboxPlaylist.kt   |  38 +-
 .../play/subsonic/models/JukeboxStatus.kt     |  50 +-
 .../play/subsonic/models/License.kt           |  60 +--
 .../play/subsonic/models/Lyrics.kt            |  44 +-
 .../play/subsonic/models/MediaType.kt         |  28 +-
 .../play/subsonic/models/MusicFolder.kt       |  31 +-
 .../play/subsonic/models/MusicFolders.kt      |  26 +-
 .../play/subsonic/models/NewestPodcasts.kt    |  26 +-
 .../play/subsonic/models/NowPlaying.kt        |  38 +-
 .../play/subsonic/models/NowPlayingEntry.kt   |  83 +--
 .../play/subsonic/models/ObjectFactory.java   | 443 ----------------
 .../play/subsonic/models/PlayQueue.kt         | 149 +-----
 .../play/subsonic/models/Playlist.kt          | 165 ++----
 .../play/subsonic/models/PlaylistWithSongs.kt |  29 +-
 .../play/subsonic/models/Playlists.kt         |  26 +-
 .../play/subsonic/models/PodcastChannel.kt    | 119 +----
 .../play/subsonic/models/PodcastEpisode.kt    | 412 +++-----------
 .../play/subsonic/models/PodcastStatus.kt     |  32 +-
 .../play/subsonic/models/Podcasts.kt          |  26 +-
 .../play/subsonic/models/ResponseStatus.kt    |  24 +-
 .../play/subsonic/models/ScanStatus.kt        |  31 +-
 .../play/subsonic/models/SearchResult.kt      |  70 +--
 .../play/subsonic/models/SearchResult2.kt     |  54 +-
 .../play/subsonic/models/SearchResult3.kt     |  54 +-
 .../play/subsonic/models/Share.kt             | 209 +-------
 .../play/subsonic/models/Shares.kt            |  38 +-
 .../play/subsonic/models/SimilarArtistID3.kt  |  56 +-
 .../play/subsonic/models/SimilarSongs.kt      |  38 +-
 .../play/subsonic/models/SimilarSongs2.kt     |  26 +-
 .../play/subsonic/models/Songs.kt             |  26 +-
 .../play/subsonic/models/Starred.kt           |  96 +---
 .../play/subsonic/models/Starred2.kt          |  54 +-
 .../play/subsonic/models/SubsonicResponse.kt  | 501 +++---------------
 .../play/subsonic/models/TopSongs.kt          |  26 +-
 .../play/subsonic/models/User.kt              | 335 +-----------
 .../play/subsonic/models/Users.kt             |  38 +-
 .../play/subsonic/models/VideoConversion.kt   |  48 +-
 .../play/subsonic/models/VideoInfo.kt         | 118 +----
 .../play/subsonic/models/Videos.kt            |  38 +-
 .../play/ui/activity/MainActivity.java        |  20 +-
 .../play/ui/dialog/ConnectionAlertDialog.java |   9 +-
 .../play/ui/dialog/PlaylistChooserDialog.java |   2 +-
 .../play/ui/dialog/RatingDialog.java          |   4 +-
 .../play/ui/dialog/StarredSyncDialog.java     |   4 +-
 .../ui/fragment/AlbumListPageFragment.java    |   3 +
 .../play/ui/fragment/AlbumPageFragment.java   |   8 +-
 .../play/ui/fragment/ArtistPageFragment.java  |  10 +-
 .../play/ui/fragment/DownloadFragment.java    |   9 +-
 .../play/ui/fragment/FilterFragment.java      |  13 +-
 .../ui/fragment/GenreCatalogueFragment.java   |   3 +
 .../play/ui/fragment/HomeFragment.java        |   6 +-
 .../play/ui/fragment/LoginFragment.java       |  26 +-
 .../ui/fragment/PlayerControllerFragment.java |  23 +-
 .../play/ui/fragment/PlayerCoverFragment.java |   5 +-
 .../play/ui/fragment/PlayerQueueFragment.java |   5 +-
 .../fragment/PlaylistCatalogueFragment.java   |  10 +-
 .../ui/fragment/PlaylistPageFragment.java     |   8 +-
 .../play/ui/fragment/SearchFragment.java      |  23 +-
 .../play/ui/fragment/SettingsFragment.java    |  11 +-
 .../ui/fragment/SongListPageFragment.java     |   8 +-
 .../AlbumBottomSheetDialog.java               |  14 +-
 .../ArtistBottomSheetDialog.java              |  12 +-
 .../PodcastBottomSheetDialog.java             |  31 +-
 .../SongBottomSheetDialog.java                |   8 +-
 .../cappielloantonio/play/util/Constants.kt   |   5 +
 .../play/util/MappingUtil.java                | 249 ++-------
 .../cappielloantonio/play/util/MusicUtil.java |  12 +-
 .../play/util/PreferenceUtil.java             | 194 -------
 .../cappielloantonio/play/util/Preferences.kt | 189 +++++++
 .../viewmodel/AlbumBottomSheetViewModel.java  |  23 +-
 .../viewmodel/AlbumCatalogueViewModel.java    |  12 +-
 .../viewmodel/AlbumListPageViewModel.java     |  19 +-
 .../play/viewmodel/AlbumPageViewModel.java    |  22 +-
 .../viewmodel/ArtistBottomSheetViewModel.java |  16 +-
 .../viewmodel/ArtistCatalogueViewModel.java   |   8 +-
 .../viewmodel/ArtistListPageViewModel.java    |  12 +-
 .../play/viewmodel/ArtistPageViewModel.java   |  19 +-
 .../play/viewmodel/DownloadViewModel.java     |   9 +-
 .../play/viewmodel/FilterViewModel.java       |   2 +-
 .../viewmodel/GenreCatalogueViewModel.java    |   2 +-
 .../play/viewmodel/HomeViewModel.java         |  81 ++-
 .../play/viewmodel/LibraryViewModel.java      |  16 +-
 .../viewmodel/PlayerBottomSheetViewModel.java |  40 +-
 .../viewmodel/PlaylistCatalogueViewModel.java |  20 +-
 .../viewmodel/PlaylistChooserViewModel.java   |  10 +-
 .../viewmodel/PlaylistEditorViewModel.java    |  22 +-
 .../play/viewmodel/PlaylistPageViewModel.java |  22 +-
 .../PodcastBottomSheetViewModel.java          |  12 +-
 .../play/viewmodel/RatingViewModel.java       |  30 +-
 .../play/viewmodel/SearchViewModel.java       |  16 +-
 .../viewmodel/SongBottomSheetViewModel.java   |  35 +-
 .../play/viewmodel/SongListPageViewModel.java |  23 +-
 .../play/viewmodel/StarredSyncViewModel.java  |   6 +-
 168 files changed, 2026 insertions(+), 6588 deletions(-)
 create mode 100644 app/src/main/java/com/cappielloantonio/play/database/converter/DateConverters.kt
 delete mode 100644 app/src/main/java/com/cappielloantonio/play/model/PodcastChannel.kt
 delete mode 100644 app/src/main/java/com/cappielloantonio/play/subsonic/models/ObjectFactory.java
 create mode 100644 app/src/main/java/com/cappielloantonio/play/util/Constants.kt
 delete mode 100644 app/src/main/java/com/cappielloantonio/play/util/PreferenceUtil.java
 create mode 100644 app/src/main/java/com/cappielloantonio/play/util/Preferences.kt

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 0636703d..f1ea1152 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,9 +1,8 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="ConstantConditions" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="false" />
-      <option name="DONT_REPORT_TRUE_ASSERT_STATEMENTS" value="false" />
+    <inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,okhttp3.Interceptor.Chain,proceed" />
     </inspection_tool>
     <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
       <option name="processCode" value="true" />
diff --git a/app/src/main/java/com/cappielloantonio/play/App.java b/app/src/main/java/com/cappielloantonio/play/App.java
index faa1e236..7bb8dcd0 100644
--- a/app/src/main/java/com/cappielloantonio/play/App.java
+++ b/app/src/main/java/com/cappielloantonio/play/App.java
@@ -9,13 +9,14 @@ import androidx.preference.PreferenceManager;
 import com.cappielloantonio.play.helper.ThemeHelper;
 import com.cappielloantonio.play.subsonic.Subsonic;
 import com.cappielloantonio.play.subsonic.SubsonicPreferences;
-import com.cappielloantonio.play.util.PreferenceUtil;
+import com.cappielloantonio.play.util.Constants;
+import com.cappielloantonio.play.util.Preferences;
 import com.google.android.material.color.DynamicColors;
 
 public class App extends Application {
-    private static final String TAG = "App";
     private static App instance;
     private static Subsonic subsonic;
+    private static SharedPreferences preferences;
 
     @Override
     public void onCreate() {
@@ -23,8 +24,10 @@ public class App extends Application {
 
         DynamicColors.applyToActivitiesIfAvailable(this);
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-        String themePref = sharedPreferences.getString(PreferenceUtil.THEME, ThemeHelper.DEFAULT_MODE);
+        String themePref = sharedPreferences.getString(Preferences.THEME, ThemeHelper.DEFAULT_MODE);
         ThemeHelper.applyTheme(themePref);
+
+        preferences = getSharedPreferences(Constants.SHARED_PREF_KEY, Context.MODE_PRIVATE);
     }
 
     public static App getInstance() {
@@ -41,13 +44,21 @@ public class App extends Application {
         return subsonic;
     }
 
+    public SharedPreferences getPreferences() {
+        if (preferences == null) {
+            preferences = getSharedPreferences(Constants.SHARED_PREF_KEY, Context.MODE_PRIVATE);
+        }
+
+        return preferences;
+    }
+
     private static Subsonic getSubsonicClient(Context context) {
-        String server = PreferenceUtil.getInstance(context).getServer();
-        String username = PreferenceUtil.getInstance(context).getUser();
-        String password = PreferenceUtil.getInstance(context).getPassword();
-        String token = PreferenceUtil.getInstance(context).getToken();
-        String salt = PreferenceUtil.getInstance(context).getSalt();
-        boolean isLowSecurity = PreferenceUtil.getInstance(context).isLowScurity();
+        String server = Preferences.getServer();
+        String username = Preferences.getUser();
+        String password = Preferences.getPassword();
+        String token = Preferences.getToken();
+        String salt = Preferences.getSalt();
+        boolean isLowSecurity = Preferences.isLowScurity();
 
         SubsonicPreferences preferences = new SubsonicPreferences();
         preferences.setServerUrl(server);
@@ -55,9 +66,12 @@ public class App extends Application {
         preferences.setAuthentication(password, token, salt, isLowSecurity);
 
         if (preferences.getAuthentication() != null) {
-            if (preferences.getAuthentication().getPassword() != null) PreferenceUtil.getInstance(context).setPassword(preferences.getAuthentication().getPassword());
-            if (preferences.getAuthentication().getToken() != null) PreferenceUtil.getInstance(context).setToken(preferences.getAuthentication().getToken());
-            if (preferences.getAuthentication().getSalt() != null) PreferenceUtil.getInstance(context).setSalt(preferences.getAuthentication().getSalt());
+            if (preferences.getAuthentication().getPassword() != null)
+                Preferences.setPassword(preferences.getAuthentication().getPassword());
+            if (preferences.getAuthentication().getToken() != null)
+                Preferences.setToken(preferences.getAuthentication().getToken());
+            if (preferences.getAuthentication().getSalt() != null)
+                Preferences.setSalt(preferences.getAuthentication().getSalt());
         }
 
         return new Subsonic(context, preferences);
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java
index 2d045388..ec635dba 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java
@@ -16,10 +16,9 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
 import com.cappielloantonio.play.interfaces.ClickCallback;
-import com.cappielloantonio.play.model.Album;
+import com.cappielloantonio.play.subsonic.models.AlbumID3;
 import com.cappielloantonio.play.util.MusicUtil;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -27,7 +26,7 @@ public class AlbumAdapter extends RecyclerView.Adapter<AlbumAdapter.ViewHolder>
     private final Context context;
     private final ClickCallback click;
 
-    private List<Album> albums;
+    private List<AlbumID3> albums;
 
     public AlbumAdapter(Context context, ClickCallback click) {
         this.context = context;
@@ -44,13 +43,13 @@ public class AlbumAdapter extends RecyclerView.Adapter<AlbumAdapter.ViewHolder>
 
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
-        Album album = albums.get(position);
+        AlbumID3 album = albums.get(position);
 
-        holder.textAlbumName.setText(MusicUtil.getReadableString(album.getTitle()));
-        holder.textArtistName.setText(MusicUtil.getReadableString(album.getArtistName()));
+        holder.textAlbumName.setText(MusicUtil.getReadableString(album.getName()));
+        holder.textArtistName.setText(MusicUtil.getReadableString(album.getArtist()));
 
         CustomGlideRequest.Builder
-                .from(context, album.getPrimary(), CustomGlideRequest.ALBUM_PIC, null)
+                .from(context, album.getCoverArtId(), CustomGlideRequest.ALBUM_PIC, null)
                 .build()
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))
                 .into(holder.cover);
@@ -61,11 +60,11 @@ public class AlbumAdapter extends RecyclerView.Adapter<AlbumAdapter.ViewHolder>
         return albums.size();
     }
 
-    public Album getItem(int position) {
+    public AlbumID3 getItem(int position) {
         return albums.get(position);
     }
 
-    public void setItems(List<Album> albums) {
+    public void setItems(List<AlbumID3> albums) {
         this.albums = albums;
         notifyDataSetChanged();
     }
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java
index bf7f1cda..2d680741 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java
@@ -16,7 +16,7 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
 import com.cappielloantonio.play.interfaces.ClickCallback;
-import com.cappielloantonio.play.model.Album;
+import com.cappielloantonio.play.subsonic.models.AlbumID3;
 import com.cappielloantonio.play.util.MusicUtil;
 
 import java.util.Collections;
@@ -26,7 +26,7 @@ public class AlbumArtistPageOrSimilarAdapter extends RecyclerView.Adapter<AlbumA
     private final Context context;
     private final ClickCallback click;
 
-    private List<Album> albums;
+    private List<AlbumID3> albums;
 
     public AlbumArtistPageOrSimilarAdapter(Context context, ClickCallback click) {
         this.context = context;
@@ -43,13 +43,13 @@ public class AlbumArtistPageOrSimilarAdapter extends RecyclerView.Adapter<AlbumA
 
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
-        Album album = albums.get(position);
+        AlbumID3 album = albums.get(position);
 
-        holder.textAlbumName.setText(MusicUtil.getReadableString(album.getTitle()));
-        holder.textArtistName.setText(MusicUtil.getReadableString(album.getArtistName()));
+        holder.textAlbumName.setText(MusicUtil.getReadableString(album.getName()));
+        holder.textArtistName.setText(MusicUtil.getReadableString(album.getArtist()));
 
         CustomGlideRequest.Builder
-                .from(context, album.getPrimary(), CustomGlideRequest.ALBUM_PIC, null)
+                .from(context, album.getCoverArtId(), CustomGlideRequest.ALBUM_PIC, null)
                 .build()
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))
                 .into(holder.cover);
@@ -60,11 +60,11 @@ public class AlbumArtistPageOrSimilarAdapter extends RecyclerView.Adapter<AlbumA
         return albums.size();
     }
 
-    public Album getItem(int position) {
+    public AlbumID3 getItem(int position) {
         return albums.get(position);
     }
 
-    public void setItems(List<Album> albums) {
+    public void setItems(List<AlbumID3> albums) {
         this.albums = albums;
         notifyDataSetChanged();
     }
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java
index 48a50392..6f9f0b25 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java
@@ -19,6 +19,7 @@ import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
 import com.cappielloantonio.play.interfaces.ClickCallback;
 import com.cappielloantonio.play.model.Album;
+import com.cappielloantonio.play.subsonic.models.AlbumID3;
 import com.cappielloantonio.play.util.MusicUtil;
 
 import java.util.ArrayList;
@@ -32,15 +33,15 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
     private final Filter filtering = new Filter() {
         @Override
         protected FilterResults performFiltering(CharSequence constraint) {
-            List<Album> filteredList = new ArrayList<>();
+            List<AlbumID3> filteredList = new ArrayList<>();
 
             if (constraint == null || constraint.length() == 0) {
                 filteredList.addAll(albumsFull);
             } else {
                 String filterPattern = constraint.toString().toLowerCase().trim();
 
-                for (Album item : albumsFull) {
-                    if (item.getTitle().toLowerCase().contains(filterPattern)) {
+                for (AlbumID3 item : albumsFull) {
+                    if (item.getName().toLowerCase().contains(filterPattern)) {
                         filteredList.add(item);
                     }
                 }
@@ -60,8 +61,8 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
         }
     };
 
-    private List<Album> albums;
-    private List<Album> albumsFull;
+    private List<AlbumID3> albums;
+    private List<AlbumID3> albumsFull;
 
     public AlbumCatalogueAdapter(Context context, ClickCallback click) {
         this.context = context;
@@ -78,13 +79,13 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
 
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
-        Album album = albums.get(position);
+        AlbumID3 album = albums.get(position);
 
-        holder.textAlbumName.setText(MusicUtil.getReadableString(album.getTitle()));
-        holder.textArtistName.setText(MusicUtil.getReadableString(album.getArtistName()));
+        holder.textAlbumName.setText(MusicUtil.getReadableString(album.getName()));
+        holder.textArtistName.setText(MusicUtil.getReadableString(album.getArtist()));
 
         CustomGlideRequest.Builder
-                .from(context, album.getPrimary(), CustomGlideRequest.ALBUM_PIC, null)
+                .from(context, album.getCoverArtId(), CustomGlideRequest.ALBUM_PIC, null)
                 .build()
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))
                 .into(holder.cover);
@@ -95,11 +96,11 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
         return albums.size();
     }
 
-    public Album getItem(int position) {
+    public AlbumID3 getItem(int position) {
         return albums.get(position);
     }
 
-    public void setItems(List<Album> albums) {
+    public void setItems(List<AlbumID3> albums) {
         this.albums = albums;
         this.albumsFull = new ArrayList<>(albums);
         notifyDataSetChanged();
@@ -160,13 +161,13 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
     public void sort(String order) {
         switch (order) {
             case Album.ORDER_BY_NAME:
-                albums.sort(Comparator.comparing(Album::getTitle));
+                albums.sort(Comparator.comparing(AlbumID3::getName));
                 break;
             case Album.ORDER_BY_ARTIST:
-                albums.sort(Comparator.comparing(Album::getArtistName));
+                albums.sort(Comparator.comparing(AlbumID3::getArtist));
                 break;
             case Album.ORDER_BY_YEAR:
-                albums.sort(Comparator.comparing(Album::getYear));
+                albums.sort(Comparator.comparing(AlbumID3::getYear));
                 break;
             case Album.ORDER_BY_RANDOM:
                 Collections.shuffle(albums);
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumHorizontalAdapter.java
index 75edfeec..6401a95e 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumHorizontalAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumHorizontalAdapter.java
@@ -16,7 +16,7 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
 import com.cappielloantonio.play.interfaces.ClickCallback;
-import com.cappielloantonio.play.model.Album;
+import com.cappielloantonio.play.subsonic.models.AlbumID3;
 import com.cappielloantonio.play.util.MusicUtil;
 
 import java.util.Collections;
@@ -27,7 +27,7 @@ public class AlbumHorizontalAdapter extends RecyclerView.Adapter<AlbumHorizontal
     private final ClickCallback click;
     private final boolean isOffline;
 
-    private List<Album> albums;
+    private List<AlbumID3> albums;
 
     public AlbumHorizontalAdapter(Context context, ClickCallback click, boolean isOffline) {
         this.context = context;
@@ -45,13 +45,13 @@ public class AlbumHorizontalAdapter extends RecyclerView.Adapter<AlbumHorizontal
 
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
-        Album album = albums.get(position);
+        AlbumID3 album = albums.get(position);
 
-        holder.albumTitle.setText(MusicUtil.getReadableString(album.getTitle()));
-        holder.albumArtist.setText(MusicUtil.getReadableString(album.getArtistName()));
+        holder.albumTitle.setText(MusicUtil.getReadableString(album.getName()));
+        holder.albumArtist.setText(MusicUtil.getReadableString(album.getArtist()));
 
         CustomGlideRequest.Builder
-                .from(context, album.getPrimary(), CustomGlideRequest.ALBUM_PIC, null)
+                .from(context, album.getCoverArtId(), CustomGlideRequest.ALBUM_PIC, null)
                 .build()
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))
                 .into(holder.cover);
@@ -62,12 +62,12 @@ public class AlbumHorizontalAdapter extends RecyclerView.Adapter<AlbumHorizontal
         return albums.size();
     }
 
-    public void setItems(List<Album> albums) {
+    public void setItems(List<AlbumID3> albums) {
         this.albums = albums;
         notifyDataSetChanged();
     }
 
-    public Album getItem(int id) {
+    public AlbumID3 getItem(int id) {
         return albums.get(id);
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java
index 0dfbe932..85f32934 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java
@@ -9,28 +9,19 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.Observer;
 import androidx.media3.common.util.UnstableApi;
-import androidx.media3.session.MediaBrowser;
-import androidx.navigation.Navigation;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
-import com.cappielloantonio.play.App;
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
 import com.cappielloantonio.play.interfaces.ClickCallback;
-import com.cappielloantonio.play.model.Artist;
-import com.cappielloantonio.play.repository.ArtistRepository;
-import com.cappielloantonio.play.ui.activity.MainActivity;
+import com.cappielloantonio.play.subsonic.models.ArtistID3;
 import com.cappielloantonio.play.util.MusicUtil;
-import com.google.common.util.concurrent.ListenableFuture;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 
 @UnstableApi
 public class ArtistAdapter extends RecyclerView.Adapter<ArtistAdapter.ViewHolder> {
@@ -39,7 +30,7 @@ public class ArtistAdapter extends RecyclerView.Adapter<ArtistAdapter.ViewHolder
     private final boolean mix;
     private final boolean bestOf;
 
-    private List<Artist> artists;
+    private List<ArtistID3> artists;
 
     public ArtistAdapter(Context context, ClickCallback click, Boolean mix, Boolean bestOf) {
         this.context = context;
@@ -58,7 +49,7 @@ public class ArtistAdapter extends RecyclerView.Adapter<ArtistAdapter.ViewHolder
 
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
-        Artist artist = artists.get(position);
+        ArtistID3 artist = artists.get(position);
 
         holder.textArtistName.setText(MusicUtil.getReadableString(artist.getName()));
 
@@ -70,11 +61,11 @@ public class ArtistAdapter extends RecyclerView.Adapter<ArtistAdapter.ViewHolder
         return artists.size();
     }
 
-    public Artist getItem(int position) {
+    public ArtistID3 getItem(int position) {
         return artists.get(position);
     }
 
-    public void setItems(List<Artist> artists) {
+    public void setItems(List<ArtistID3> artists) {
         this.artists = artists;
         notifyDataSetChanged();
     }
@@ -89,9 +80,9 @@ public class ArtistAdapter extends RecyclerView.Adapter<ArtistAdapter.ViewHolder
         return position;
     }
 
-    private void setArtistCover(Artist artist, ImageView cover) {
+    private void setArtistCover(ArtistID3 artist, ImageView cover) {
         CustomGlideRequest.Builder
-                .from(context, artist.getPrimary(), CustomGlideRequest.ARTIST_PIC, null)
+                .from(context, artist.getCoverArtId(), CustomGlideRequest.ARTIST_PIC, null)
                 .build()
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))
                 .into(cover);
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java
index c5d95fe1..8120240b 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java
@@ -11,18 +11,15 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.Observer;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
-import com.cappielloantonio.play.App;
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
 import com.cappielloantonio.play.interfaces.ClickCallback;
 import com.cappielloantonio.play.model.Artist;
-import com.cappielloantonio.play.repository.ArtistRepository;
+import com.cappielloantonio.play.subsonic.models.ArtistID3;
 import com.cappielloantonio.play.util.MusicUtil;
 
 import java.util.ArrayList;
@@ -37,14 +34,14 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogue
     private final Filter filtering = new Filter() {
         @Override
         protected FilterResults performFiltering(CharSequence constraint) {
-            List<Artist> filteredList = new ArrayList<>();
+            List<ArtistID3> filteredList = new ArrayList<>();
 
             if (constraint == null || constraint.length() == 0) {
                 filteredList.addAll(artistFull);
             } else {
                 String filterPattern = constraint.toString().toLowerCase().trim();
 
-                for (Artist item : artistFull) {
+                for (ArtistID3 item : artistFull) {
                     if (item.getName().toLowerCase().contains(filterPattern)) {
                         filteredList.add(item);
                     }
@@ -65,8 +62,8 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogue
         }
     };
 
-    private List<Artist> artists;
-    private List<Artist> artistFull;
+    private List<ArtistID3> artists;
+    private List<ArtistID3> artistFull;
 
     public ArtistCatalogueAdapter(Context context, ClickCallback click) {
         this.context = context;
@@ -83,7 +80,7 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogue
 
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
-        Artist artist = artists.get(position);
+        ArtistID3 artist = artists.get(position);
 
         holder.textArtistName.setText(MusicUtil.getReadableString(artist.getName()));
 
@@ -95,11 +92,11 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogue
         return artists.size();
     }
 
-    public Artist getItem(int position) {
+    public ArtistID3 getItem(int position) {
         return artists.get(position);
     }
 
-    public void setItems(List<Artist> artists) {
+    public void setItems(List<ArtistID3> artists) {
         this.artists = artists;
         this.artistFull = new ArrayList<>(artists);
         notifyDataSetChanged();
@@ -120,9 +117,9 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogue
         return filtering;
     }
 
-    private void setArtistCover(Artist artist, ImageView cover) {
+    private void setArtistCover(ArtistID3 artist, ImageView cover) {
         CustomGlideRequest.Builder
-                .from(context, artist.getPrimary(), CustomGlideRequest.ARTIST_PIC, null)
+                .from(context, artist.getCoverArtId(), CustomGlideRequest.ARTIST_PIC, null)
                 .build()
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))
                 .into(cover);
@@ -164,7 +161,7 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogue
     public void sort(String order) {
         switch (order) {
             case Artist.ORDER_BY_NAME:
-                artists.sort(Comparator.comparing(Artist::getName));
+                artists.sort(Comparator.comparing(ArtistID3::getName));
                 break;
             case Artist.ORDER_BY_RANDOM:
                 Collections.shuffle(artists);
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java
index 02a206c1..47fa80a3 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java
@@ -9,18 +9,14 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.Observer;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
-import com.cappielloantonio.play.App;
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
 import com.cappielloantonio.play.interfaces.ClickCallback;
-import com.cappielloantonio.play.model.Artist;
-import com.cappielloantonio.play.repository.ArtistRepository;
+import com.cappielloantonio.play.subsonic.models.ArtistID3;
 import com.cappielloantonio.play.util.MusicUtil;
 
 import java.util.Collections;
@@ -30,7 +26,7 @@ public class ArtistHorizontalAdapter extends RecyclerView.Adapter<ArtistHorizont
     private final Context context;
     private final ClickCallback click;
 
-    private List<Artist> artists;
+    private List<ArtistID3> artists;
 
     public ArtistHorizontalAdapter(Context context, ClickCallback click) {
         this.context = context;
@@ -47,7 +43,7 @@ public class ArtistHorizontalAdapter extends RecyclerView.Adapter<ArtistHorizont
 
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
-        Artist artist = artists.get(position);
+        ArtistID3 artist = artists.get(position);
 
         holder.artistName.setText(MusicUtil.getReadableString(artist.getName()));
 
@@ -65,12 +61,12 @@ public class ArtistHorizontalAdapter extends RecyclerView.Adapter<ArtistHorizont
         return artists.size();
     }
 
-    public void setItems(List<Artist> artists) {
+    public void setItems(List<ArtistID3> artists) {
         this.artists = artists;
         notifyDataSetChanged();
     }
 
-    public Artist getItem(int id) {
+    public ArtistID3 getItem(int id) {
         return artists.get(id);
     }
 
@@ -84,9 +80,9 @@ public class ArtistHorizontalAdapter extends RecyclerView.Adapter<ArtistHorizont
         return position;
     }
 
-    private void setArtistCover(Artist artist, ImageView cover) {
+    private void setArtistCover(ArtistID3 artist, ImageView cover) {
         CustomGlideRequest.Builder
-                .from(context, artist.getPrimary(), CustomGlideRequest.ARTIST_PIC, null)
+                .from(context, artist.getCoverArtId(), CustomGlideRequest.ARTIST_PIC, null)
                 .build()
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))
                 .into(cover);
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java
index d300c1da..bf4539e0 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java
@@ -9,23 +9,17 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.Observer;
 import androidx.navigation.Navigation;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
-import com.cappielloantonio.play.App;
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
 import com.cappielloantonio.play.interfaces.ClickCallback;
-import com.cappielloantonio.play.model.Artist;
-import com.cappielloantonio.play.repository.ArtistRepository;
+import com.cappielloantonio.play.subsonic.models.SimilarArtistID3;
 import com.cappielloantonio.play.util.MusicUtil;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -33,7 +27,7 @@ public class ArtistSimilarAdapter extends RecyclerView.Adapter<ArtistSimilarAdap
     private final Context context;
     private final ClickCallback click;
 
-    private List<Artist> artists;
+    private List<SimilarArtistID3> artists;
 
     public ArtistSimilarAdapter(Context context, ClickCallback click) {
         this.context = context;
@@ -50,7 +44,7 @@ public class ArtistSimilarAdapter extends RecyclerView.Adapter<ArtistSimilarAdap
 
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
-        Artist artist = artists.get(position);
+        SimilarArtistID3 artist = artists.get(position);
 
         holder.textArtistName.setText(MusicUtil.getReadableString(artist.getName()));
 
@@ -62,11 +56,11 @@ public class ArtistSimilarAdapter extends RecyclerView.Adapter<ArtistSimilarAdap
         return artists.size();
     }
 
-    public Artist getItem(int position) {
+    public SimilarArtistID3 getItem(int position) {
         return artists.get(position);
     }
 
-    public void setItems(List<Artist> artists) {
+    public void setItems(List<SimilarArtistID3> artists) {
         this.artists = artists;
         notifyDataSetChanged();
     }
@@ -81,9 +75,9 @@ public class ArtistSimilarAdapter extends RecyclerView.Adapter<ArtistSimilarAdap
         return position;
     }
 
-    private void setArtistCover(Artist artist, ImageView cover) {
+    private void setArtistCover(SimilarArtistID3 artist, ImageView cover) {
         CustomGlideRequest.Builder
-                .from(context, artist.getPrimary(), CustomGlideRequest.ARTIST_PIC, null)
+                .from(context, artist.getCoverArtId(), CustomGlideRequest.ARTIST_PIC, null)
                 .build()
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))
                 .into(cover);
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java
index 1972fecd..76d59eae 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java
@@ -15,7 +15,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
 import com.cappielloantonio.play.interfaces.ClickCallback;
-import com.cappielloantonio.play.model.Media;
+import com.cappielloantonio.play.subsonic.models.Child;
 import com.cappielloantonio.play.util.MusicUtil;
 
 import java.util.Collections;
@@ -25,7 +25,7 @@ public class DiscoverSongAdapter extends RecyclerView.Adapter<DiscoverSongAdapte
     private final Context context;
     private final ClickCallback click;
 
-    private List<Media> songs;
+    private List<Child> songs;
 
     public DiscoverSongAdapter(Context context, ClickCallback click) {
         this.context = context;
@@ -42,10 +42,10 @@ public class DiscoverSongAdapter extends RecyclerView.Adapter<DiscoverSongAdapte
 
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
-        Media song = songs.get(position);
+        Child song = songs.get(position);
 
         holder.textTitle.setText(MusicUtil.getReadableString(song.getTitle()));
-        holder.textAlbum.setText(MusicUtil.getReadableString(song.getAlbumName()));
+        holder.textAlbum.setText(MusicUtil.getReadableString(song.getAlbum()));
 
         CustomGlideRequest.Builder
                 .from(context, song.getCoverArtId(), CustomGlideRequest.SONG_PIC, null)
@@ -64,7 +64,7 @@ public class DiscoverSongAdapter extends RecyclerView.Adapter<DiscoverSongAdapte
         return songs.size();
     }
 
-    public void setItems(List<Media> songs) {
+    public void setItems(List<Child> songs) {
         this.songs = songs;
         notifyDataSetChanged();
     }
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/GenreAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/GenreAdapter.java
index d5f1e874..bd61b9f4 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/GenreAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/GenreAdapter.java
@@ -12,8 +12,8 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.interfaces.ClickCallback;
-import com.cappielloantonio.play.model.Genre;
 import com.cappielloantonio.play.model.Media;
+import com.cappielloantonio.play.subsonic.models.Genre;
 import com.cappielloantonio.play.util.MusicUtil;
 
 import java.util.Collections;
@@ -42,7 +42,7 @@ public class GenreAdapter extends RecyclerView.Adapter<GenreAdapter.ViewHolder>
     public void onBindViewHolder(ViewHolder holder, int position) {
         Genre genre = genres.get(position);
 
-        holder.textGenre.setText(MusicUtil.getReadableString(genre.getName()));
+        holder.textGenre.setText(MusicUtil.getReadableString(genre.getGenre()));
     }
 
     @Override
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/GenreCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/GenreCatalogueAdapter.java
index c38aa699..c4efa624 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/GenreCatalogueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/GenreCatalogueAdapter.java
@@ -14,9 +14,8 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.interfaces.ClickCallback;
-import com.cappielloantonio.play.model.Genre;
 import com.cappielloantonio.play.model.Media;
-import com.cappielloantonio.play.ui.activity.MainActivity;
+import com.cappielloantonio.play.subsonic.models.Genre;
 import com.cappielloantonio.play.util.MusicUtil;
 
 import java.util.ArrayList;
@@ -39,7 +38,7 @@ public class GenreCatalogueAdapter extends RecyclerView.Adapter<GenreCatalogueAd
                 String filterPattern = constraint.toString().toLowerCase().trim();
 
                 for (Genre item : genresFull) {
-                    if (item.getName().toLowerCase().contains(filterPattern)) {
+                    if (item.getGenre().toLowerCase().contains(filterPattern)) {
                         filteredList.add(item);
                     }
                 }
@@ -79,7 +78,7 @@ public class GenreCatalogueAdapter extends RecyclerView.Adapter<GenreCatalogueAd
     public void onBindViewHolder(ViewHolder holder, int position) {
         Genre genre = genres.get(position);
 
-        holder.textGenre.setText(MusicUtil.getReadableString(genre.getName()));
+        holder.textGenre.setText(MusicUtil.getReadableString(genre.getGenre()));
     }
 
     @Override
@@ -122,10 +121,10 @@ public class GenreCatalogueAdapter extends RecyclerView.Adapter<GenreCatalogueAd
 
     public void sort(String order) {
         switch (order) {
-            case Genre.ORDER_BY_NAME:
-                genres.sort(Comparator.comparing(Genre::getName));
+            case com.cappielloantonio.play.model.Genre.ORDER_BY_NAME:
+                genres.sort(Comparator.comparing(Genre::getGenre));
                 break;
-            case Genre.ORDER_BY_RANDOM:
+            case com.cappielloantonio.play.model.Genre.ORDER_BY_RANDOM:
                 Collections.shuffle(genres);
                 break;
         }
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java
index c9367376..93fbed1e 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java
@@ -17,8 +17,8 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
 import com.cappielloantonio.play.interfaces.ClickCallback;
-import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.service.MediaManager;
+import com.cappielloantonio.play.subsonic.models.Child;
 import com.cappielloantonio.play.util.MusicUtil;
 import com.google.common.util.concurrent.ListenableFuture;
 
@@ -31,7 +31,7 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
     private final ClickCallback click;
 
     private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
-    private List<Media> songs;
+    private List<Child> songs;
 
     public PlayerSongQueueAdapter(Context context, ClickCallback click) {
         this.context = context;
@@ -48,10 +48,10 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
 
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
-        Media song = songs.get(position);
+        Child song = songs.get(position);
 
         holder.songTitle.setText(MusicUtil.getReadableString(song.getTitle()));
-        holder.songSubtitle.setText(context.getString(R.string.song_subtitle_formatter, MusicUtil.getReadableString(song.getArtistName()), MusicUtil.getReadableDurationString(song.getDuration(), false)));
+        holder.songSubtitle.setText(context.getString(R.string.song_subtitle_formatter, MusicUtil.getReadableString(song.getArtist()), MusicUtil.getReadableDurationString(song.getDuration(), false)));
 
         CustomGlideRequest.Builder
                 .from(context, song.getCoverArtId(), CustomGlideRequest.SONG_PIC, null)
@@ -69,11 +69,11 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
         return songs.size();
     }
 
-    public List<Media> getItems() {
+    public List<Child> getItems() {
         return this.songs;
     }
 
-    public void setItems(List<Media> songs) {
+    public void setItems(List<Child> songs) {
         this.songs = songs;
         notifyDataSetChanged();
     }
@@ -82,7 +82,7 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
         this.mediaBrowserListenableFuture = mediaBrowserListenableFuture;
     }
 
-    public Media getItem(int id) {
+    public Child getItem(int id) {
         return songs.get(id);
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistDialogHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistDialogHorizontalAdapter.java
index c742fea2..22fff84c 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistDialogHorizontalAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistDialogHorizontalAdapter.java
@@ -12,12 +12,9 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.interfaces.ClickCallback;
-import com.cappielloantonio.play.model.Playlist;
-import com.cappielloantonio.play.ui.dialog.PlaylistChooserDialog;
+import com.cappielloantonio.play.subsonic.models.Playlist;
 import com.cappielloantonio.play.util.MusicUtil;
-import com.cappielloantonio.play.viewmodel.PlaylistChooserViewModel;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -27,7 +24,7 @@ public class PlaylistDialogHorizontalAdapter extends RecyclerView.Adapter<Playli
 
     private List<Playlist> playlists;
 
-    public PlaylistDialogHorizontalAdapter(Context context,ClickCallback click) {
+    public PlaylistDialogHorizontalAdapter(Context context, ClickCallback click) {
         this.context = context;
         this.click = click;
         this.playlists = Collections.emptyList();
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistDialogSongHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistDialogSongHorizontalAdapter.java
index fae905cb..dc072d33 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistDialogSongHorizontalAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistDialogSongHorizontalAdapter.java
@@ -14,7 +14,7 @@ import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
-import com.cappielloantonio.play.model.Media;
+import com.cappielloantonio.play.subsonic.models.Child;
 import com.cappielloantonio.play.util.MusicUtil;
 
 import java.util.Collections;
@@ -23,7 +23,7 @@ import java.util.List;
 public class PlaylistDialogSongHorizontalAdapter extends RecyclerView.Adapter<PlaylistDialogSongHorizontalAdapter.ViewHolder> {
     private final Context context;
 
-    private List<Media> songs;
+    private List<Child> songs;
 
     public PlaylistDialogSongHorizontalAdapter(Context context) {
         this.context = context;
@@ -39,10 +39,10 @@ public class PlaylistDialogSongHorizontalAdapter extends RecyclerView.Adapter<Pl
 
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
-        Media song = songs.get(position);
+        Child song = songs.get(position);
 
         holder.songTitle.setText(MusicUtil.getReadableString(song.getTitle()));
-        holder.songArtist.setText(MusicUtil.getReadableString(song.getArtistName()));
+        holder.songArtist.setText(MusicUtil.getReadableString(song.getArtist()));
         holder.songDuration.setText(MusicUtil.getReadableDurationString(song.getDuration(), false));
 
         CustomGlideRequest.Builder
@@ -57,16 +57,16 @@ public class PlaylistDialogSongHorizontalAdapter extends RecyclerView.Adapter<Pl
         return songs.size();
     }
 
-    public List<Media> getItems() {
+    public List<Child> getItems() {
         return this.songs;
     }
 
-    public void setItems(List<Media> songs) {
+    public void setItems(List<Child> songs) {
         this.songs = songs;
         notifyDataSetChanged();
     }
 
-    public Media getItem(int id) {
+    public Child getItem(int id) {
         return songs.get(id);
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistHorizontalAdapter.java
index cf3463e1..23a67f6c 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistHorizontalAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlaylistHorizontalAdapter.java
@@ -14,7 +14,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.interfaces.ClickCallback;
-import com.cappielloantonio.play.model.Playlist;
+import com.cappielloantonio.play.subsonic.models.Playlist;
 import com.cappielloantonio.play.util.MusicUtil;
 
 import java.util.ArrayList;
@@ -139,10 +139,10 @@ public class PlaylistHorizontalAdapter extends RecyclerView.Adapter<PlaylistHori
 
     public void sort(String order) {
         switch (order) {
-            case Playlist.ORDER_BY_NAME:
+            case com.cappielloantonio.play.model.Playlist.ORDER_BY_NAME:
                 playlists.sort(Comparator.comparing(Playlist::getName));
                 break;
-            case Playlist.ORDER_BY_RANDOM:
+            case com.cappielloantonio.play.model.Playlist.ORDER_BY_RANDOM:
                 Collections.shuffle(playlists);
                 break;
         }
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PodcastEpisodeAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PodcastEpisodeAdapter.java
index a8117951..1ca831c0 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/PodcastEpisodeAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/PodcastEpisodeAdapter.java
@@ -17,7 +17,7 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
 import com.cappielloantonio.play.interfaces.ClickCallback;
-import com.cappielloantonio.play.model.Media;
+import com.cappielloantonio.play.subsonic.models.PodcastEpisode;
 import com.cappielloantonio.play.util.MusicUtil;
 
 import java.text.SimpleDateFormat;
@@ -28,7 +28,7 @@ public class PodcastEpisodeAdapter extends RecyclerView.Adapter<PodcastEpisodeAd
     private final Context context;
     private final ClickCallback click;
 
-    private List<Media> podcastEpisodes;
+    private List<PodcastEpisode> podcastEpisodes;
 
     public PodcastEpisodeAdapter(Context context, ClickCallback click) {
         this.context = context;
@@ -45,11 +45,11 @@ public class PodcastEpisodeAdapter extends RecyclerView.Adapter<PodcastEpisodeAd
 
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
-        Media podcastEpisode = podcastEpisodes.get(position);
+        PodcastEpisode podcastEpisode = podcastEpisodes.get(position);
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MMM d");
 
         holder.textTitle.setText(MusicUtil.getReadableString(podcastEpisode.getTitle()));
-        holder.textSubtitle.setText(MusicUtil.getReadableString(podcastEpisode.getArtistName()));
+        holder.textSubtitle.setText(MusicUtil.getReadableString(podcastEpisode.getArtist()));
         holder.textReleaseAndDuration.setText(context.getString(R.string.podcast_release_date_duration_formatter, simpleDateFormat.format(podcastEpisode.getPublishDate()), MusicUtil.getReadablePodcastDurationString(podcastEpisode.getDuration())));
         holder.textDescription.setText(MusicUtil.getReadableString(podcastEpisode.getDescription()));
 
@@ -65,7 +65,7 @@ public class PodcastEpisodeAdapter extends RecyclerView.Adapter<PodcastEpisodeAd
         return podcastEpisodes.size();
     }
 
-    public void setItems(List<Media> podcastEpisodes) {
+    public void setItems(List<PodcastEpisode> podcastEpisodes) {
         this.podcastEpisodes = podcastEpisodes;
         notifyDataSetChanged();
     }
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/SimilarTrackAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/SimilarTrackAdapter.java
index d9f60cdd..c5ba1293 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/SimilarTrackAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/SimilarTrackAdapter.java
@@ -16,8 +16,7 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
 import com.cappielloantonio.play.interfaces.ClickCallback;
-import com.cappielloantonio.play.model.Media;
-import com.cappielloantonio.play.ui.activity.MainActivity;
+import com.cappielloantonio.play.subsonic.models.Child;
 import com.cappielloantonio.play.util.MusicUtil;
 
 import java.util.Collections;
@@ -27,7 +26,7 @@ public class SimilarTrackAdapter extends RecyclerView.Adapter<SimilarTrackAdapte
     private final Context context;
     private final ClickCallback click;
 
-    private List<Media> songs;
+    private List<Child> songs;
 
     public SimilarTrackAdapter(Context context, ClickCallback click) {
         this.context = context;
@@ -44,7 +43,7 @@ public class SimilarTrackAdapter extends RecyclerView.Adapter<SimilarTrackAdapte
 
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
-        Media song = songs.get(position);
+        Child song = songs.get(position);
 
         holder.textTitle.setText(MusicUtil.getReadableString(song.getTitle()));
 
@@ -60,11 +59,11 @@ public class SimilarTrackAdapter extends RecyclerView.Adapter<SimilarTrackAdapte
         return songs.size();
     }
 
-    public Media getItem(int position) {
+    public Child getItem(int position) {
         return songs.get(position);
     }
 
-    public void setItems(List<Media> songs) {
+    public void setItems(List<Child> songs) {
         this.songs = songs;
         notifyDataSetChanged();
     }
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java
index 0b7979f0..0a6de9c6 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java
@@ -10,8 +10,6 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.media3.common.util.UnstableApi;
-import androidx.media3.session.MediaBrowser;
-import androidx.navigation.Navigation;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.load.resource.bitmap.CenterCrop;
@@ -19,13 +17,8 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
 import com.cappielloantonio.play.interfaces.ClickCallback;
-import com.cappielloantonio.play.model.Media;
-import com.cappielloantonio.play.service.MediaManager;
-import com.cappielloantonio.play.ui.activity.MainActivity;
-import com.cappielloantonio.play.util.DownloadUtil;
-import com.cappielloantonio.play.util.MappingUtil;
+import com.cappielloantonio.play.subsonic.models.Child;
 import com.cappielloantonio.play.util.MusicUtil;
-import com.google.common.util.concurrent.ListenableFuture;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -37,7 +30,7 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
     private final ClickCallback click;
     private final boolean isCoverVisible;
 
-    private List<Media> songs;
+    private List<Child> songs;
 
     public SongHorizontalAdapter(Context context, ClickCallback click, boolean isCoverVisible) {
         this.context = context;
@@ -55,17 +48,18 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
 
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
-        Media song = songs.get(position);
+        Child song = songs.get(position);
 
         holder.songTitle.setText(MusicUtil.getReadableString(song.getTitle()));
-        holder.songSubtitle.setText(context.getString(R.string.song_subtitle_formatter, MusicUtil.getReadableString(song.getArtistName()), MusicUtil.getReadableDurationString(song.getDuration(), false)));
-        holder.trackNumber.setText(String.valueOf(song.getTrackNumber()));
+        holder.songSubtitle.setText(context.getString(R.string.song_subtitle_formatter, MusicUtil.getReadableString(song.getArtist()), MusicUtil.getReadableDurationString(song.getDuration(), false)));
+        holder.trackNumber.setText(String.valueOf(song.getTrack()));
 
-        if (DownloadUtil.getDownloadTracker(context).isDownloaded(MappingUtil.mapMediaItem(context, song, false))) {
+        // TODO
+        /* if (DownloadUtil.getDownloadTracker(context).isDownloaded(MappingUtil.mapMediaItem(context, song, false))) {
             holder.downloadIndicator.setVisibility(View.VISIBLE);
         } else {
             holder.downloadIndicator.setVisibility(View.GONE);
-        }
+        } */
 
         if (isCoverVisible) CustomGlideRequest.Builder
                 .from(context, song.getCoverArtId(), CustomGlideRequest.SONG_PIC, null)
@@ -87,12 +81,12 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
         return songs.size();
     }
 
-    public void setItems(List<Media> songs) {
+    public void setItems(List<Child> songs) {
         this.songs = songs;
         notifyDataSetChanged();
     }
 
-    public Media getItem(int id) {
+    public Child getItem(int id) {
         return songs.get(id);
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java b/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java
index 732e667f..2391e85f 100644
--- a/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java
+++ b/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java
@@ -1,13 +1,13 @@
 package com.cappielloantonio.play.database;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 
-import androidx.room.AutoMigration;
 import androidx.room.Database;
 import androidx.room.Room;
 import androidx.room.RoomDatabase;
+import androidx.room.TypeConverters;
 
+import com.cappielloantonio.play.database.converter.DateConverters;
 import com.cappielloantonio.play.database.dao.ChronologyDao;
 import com.cappielloantonio.play.database.dao.DownloadDao;
 import com.cappielloantonio.play.database.dao.PlaylistDao;
@@ -16,17 +16,17 @@ import com.cappielloantonio.play.database.dao.RecentSearchDao;
 import com.cappielloantonio.play.database.dao.ServerDao;
 import com.cappielloantonio.play.model.Chronology;
 import com.cappielloantonio.play.model.Download;
-import com.cappielloantonio.play.model.Playlist;
 import com.cappielloantonio.play.model.Queue;
 import com.cappielloantonio.play.model.RecentSearch;
 import com.cappielloantonio.play.model.Server;
+import com.cappielloantonio.play.subsonic.models.Playlist;
 
-@SuppressLint("RestrictedApi")
 @Database(
-        version = 46,
+        version = 48,
         entities = {Queue.class, Server.class, RecentSearch.class, Download.class, Playlist.class, Chronology.class}
         // autoMigrations = {@AutoMigration(from = 43, to = 44)}
 )
+@TypeConverters({DateConverters.class})
 public abstract class AppDatabase extends RoomDatabase {
     private final static String DB_NAME = "play_db";
     private static AppDatabase instance;
diff --git a/app/src/main/java/com/cappielloantonio/play/database/converter/DateConverters.kt b/app/src/main/java/com/cappielloantonio/play/database/converter/DateConverters.kt
new file mode 100644
index 00000000..495b0141
--- /dev/null
+++ b/app/src/main/java/com/cappielloantonio/play/database/converter/DateConverters.kt
@@ -0,0 +1,16 @@
+package com.cappielloantonio.play.database.converter
+
+import androidx.room.TypeConverter
+import java.util.*
+
+class DateConverters {
+    @TypeConverter
+    fun fromTimestamp(value: Long?): Date? {
+        return value?.let { Date(it) }
+    }
+
+    @TypeConverter
+    fun dateToTimestamp(date: Date?): Long? {
+        return date?.time
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/database/dao/DownloadDao.java b/app/src/main/java/com/cappielloantonio/play/database/dao/DownloadDao.java
index ed7d90f2..7b416216 100644
--- a/app/src/main/java/com/cappielloantonio/play/database/dao/DownloadDao.java
+++ b/app/src/main/java/com/cappielloantonio/play/database/dao/DownloadDao.java
@@ -15,28 +15,28 @@ public interface DownloadDao {
     @Query("SELECT * FROM download WHERE server=:server")
     LiveData<List<Download>> getAll(String server);
 
-    @Query("SELECT * FROM download WHERE server=:server AND playlistId IS NULL GROUP BY artistName LIMIT :size")
+    @Query("SELECT * FROM download WHERE server=:server AND playlist_id IS NULL GROUP BY artist LIMIT :size")
     LiveData<List<Download>> getSampleArtist(int size, String server);
 
-    @Query("SELECT * FROM download WHERE server=:server AND playlistId IS NULL GROUP BY albumName LIMIT :size")
+    @Query("SELECT * FROM download WHERE server=:server AND playlist_id IS NULL GROUP BY album LIMIT :size")
     LiveData<List<Download>> getSampleAlbum(int size, String server);
 
-    @Query("SELECT * FROM download WHERE server=:server AND playlistId IS NOT NULL GROUP BY playlistId LIMIT :size")
+    @Query("SELECT * FROM download WHERE server=:server AND playlist_id IS NOT NULL GROUP BY playlist_id LIMIT :size")
     LiveData<List<Download>> getSamplePlaylist(int size, String server);
 
     @Query("SELECT * FROM download WHERE server=:server LIMIT :size")
     LiveData<List<Download>> getSample(int size, String server);
 
-    @Query("SELECT * FROM download WHERE server=:server AND artistId=:artistId")
+    @Query("SELECT * FROM download WHERE server=:server AND artist=:artistId")
     LiveData<List<Download>> getAllFromArtist(String server, String artistId);
 
-    @Query("SELECT * FROM download WHERE server=:server AND albumId=:albumId ORDER BY trackNumber ASC")
+    @Query("SELECT * FROM download WHERE server=:server AND album=:albumId ORDER BY track ASC")
     LiveData<List<Download>> getAllFromAlbum(String server, String albumId);
 
-    @Query("SELECT * FROM download WHERE server=:server AND playlistId=:playlistId")
+    @Query("SELECT * FROM download WHERE server=:server AND playlist_id=:playlistId")
     LiveData<List<Download>> getAllFromPlaylist(String server, String playlistId);
 
-    @Query("SELECT * FROM download WHERE server=:server AND playlistId IS NOT NULL GROUP BY playlistId")
+    @Query("SELECT * FROM download WHERE server=:server AND playlist_id IS NOT NULL GROUP BY playlist_id")
     LiveData<List<Download>> getAllPlaylists(String server);
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
@@ -45,7 +45,7 @@ public interface DownloadDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     void insertAll(List<Download> downloads);
 
-    @Query("DELETE FROM download WHERE mediaId = :mediaId")
+    @Query("DELETE FROM download WHERE media_id = :mediaId")
     void delete(String mediaId);
 
     @Query("DELETE FROM download WHERE server=:server")
diff --git a/app/src/main/java/com/cappielloantonio/play/database/dao/PlaylistDao.java b/app/src/main/java/com/cappielloantonio/play/database/dao/PlaylistDao.java
index 11250ad4..5e943e63 100644
--- a/app/src/main/java/com/cappielloantonio/play/database/dao/PlaylistDao.java
+++ b/app/src/main/java/com/cappielloantonio/play/database/dao/PlaylistDao.java
@@ -7,14 +7,17 @@ import androidx.room.Insert;
 import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 
-import com.cappielloantonio.play.model.Playlist;
+import com.cappielloantonio.play.subsonic.models.Playlist;
 
 import java.util.List;
 
 @Dao
 public interface PlaylistDao {
-    @Query("SELECT * FROM playlist WHERE server=:serverId")
-    LiveData<List<Playlist>> getAll(String serverId);
+    // @Query("SELECT * FROM playlist WHERE server=:serverId")
+    // LiveData<List<Playlist>> getAll(String serverId);
+
+    @Query("SELECT * FROM playlist")
+    LiveData<List<Playlist>> getAll();
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     void insert(Playlist playlist);
diff --git a/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideModule.java b/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideModule.java
index 83715018..b15d4f94 100644
--- a/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideModule.java
+++ b/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideModule.java
@@ -10,7 +10,7 @@ import com.bumptech.glide.load.DecodeFormat;
 import com.bumptech.glide.load.engine.cache.DiskLruCacheFactory;
 import com.bumptech.glide.module.AppGlideModule;
 import com.bumptech.glide.request.RequestOptions;
-import com.cappielloantonio.play.util.PreferenceUtil;
+import com.cappielloantonio.play.util.Preferences;
 
 import java.io.File;
 
@@ -19,7 +19,7 @@ public class CustomGlideModule extends AppGlideModule {
     @Override
     public void applyOptions(@NonNull Context context, GlideBuilder builder) {
         File file = new File(context.getCacheDir() + "glide");
-        int size = PreferenceUtil.getInstance(context).getImageCacheSize();
+        int size = Preferences.getImageCacheSize();
 
         builder.setDiskCache(new DiskLruCacheFactory(() -> file, size));
         builder.setDefaultRequestOptions(new RequestOptions().format(DecodeFormat.PREFER_RGB_565));
diff --git a/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java b/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java
index d9489583..d527214c 100644
--- a/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java
+++ b/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java
@@ -15,7 +15,7 @@ import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.signature.ObjectKey;
 import com.cappielloantonio.play.App;
 import com.cappielloantonio.play.util.MusicUtil;
-import com.cappielloantonio.play.util.PreferenceUtil;
+import com.cappielloantonio.play.util.Preferences;
 
 import java.util.Map;
 
@@ -71,12 +71,12 @@ public class CustomGlideRequest {
         private Builder(Context context, String item, String category, String custom) {
             this.requestManager = Glide.with(context);
 
-            if (PreferenceUtil.getInstance(context).isDataSavingMode()) {
+            if (Preferences.isDataSavingMode()) {
                 this.item = MusicUtil.getDefaultPicPerCategory(category);
-            } else if (custom != null && !PreferenceUtil.getInstance(context).isDataSavingMode()) {
+            } else if (custom != null && !Preferences.isDataSavingMode()) {
                 this.item = custom;
-            } else if (item != null && !PreferenceUtil.getInstance(context).isDataSavingMode()) {
-                this.item = createUrl(item, PreferenceUtil.getInstance(context).getImageSize());
+            } else if (item != null && !Preferences.isDataSavingMode()) {
+                this.item = createUrl(item, Preferences.getImageSize());
             } else {
                 this.item = MusicUtil.getDefaultPicPerCategory(category);
             }
diff --git a/app/src/main/java/com/cappielloantonio/play/model/Album.kt b/app/src/main/java/com/cappielloantonio/play/model/Album.kt
index f587bb74..3ab4ec28 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Album.kt
+++ b/app/src/main/java/com/cappielloantonio/play/model/Album.kt
@@ -2,62 +2,11 @@ package com.cappielloantonio.play.model
 
 import android.os.Parcelable
 import androidx.annotation.Keep
-import com.cappielloantonio.play.subsonic.models.AlbumID3
-import com.cappielloantonio.play.subsonic.models.AlbumWithSongsID3
-import com.cappielloantonio.play.util.MappingUtil
 import kotlinx.android.parcel.Parcelize
-import java.util.*
 
 @Keep
 @Parcelize
-class Album(
-    var id: String,
-    val title: String,
-    val year: Int? = 0,
-    val artistId: String,
-    val artistName: String,
-    val primary: String,
-    var starred: Boolean?,
-    val songs: List<Media>?,
-    val created: Date?
-) : Parcelable {
-
-    constructor(albumID3: AlbumID3) : this(
-        albumID3.id,
-        albumID3.name,
-        albumID3.year ?: 0,
-        albumID3.artistId,
-        albumID3.artist,
-        albumID3.coverArtId,
-        albumID3.starred != null,
-        null,
-        albumID3.created
-    )
-
-    constructor(albumWithSongsID3: AlbumWithSongsID3) : this(
-        albumWithSongsID3.id,
-        albumWithSongsID3.name,
-        albumWithSongsID3.year ?: 0,
-        albumWithSongsID3.artistId,
-        albumWithSongsID3.artist,
-        albumWithSongsID3.coverArtId,
-        albumWithSongsID3.starred != null,
-        MappingUtil.mapSong(albumWithSongsID3.songs),
-        albumWithSongsID3.created
-    )
-
-    constructor(download: Download) : this(
-        download.albumId,
-        download.albumName,
-        0,
-        download.artistId,
-        download.artistName,
-        download.primary,
-        null,
-        null,
-        null
-    )
-
+class Album : Parcelable {
     companion object {
         const val RECENTLY_PLAYED = "RECENTLY_PLAYED"
         const val MOST_PLAYED = "MOST_PLAYED"
diff --git a/app/src/main/java/com/cappielloantonio/play/model/Artist.kt b/app/src/main/java/com/cappielloantonio/play/model/Artist.kt
index 090f3152..9c34580d 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Artist.kt
+++ b/app/src/main/java/com/cappielloantonio/play/model/Artist.kt
@@ -2,98 +2,11 @@ package com.cappielloantonio.play.model
 
 import android.os.Parcelable
 import androidx.annotation.Keep
-import com.cappielloantonio.play.subsonic.models.ArtistID3
-import com.cappielloantonio.play.subsonic.models.ArtistInfo2
-import com.cappielloantonio.play.subsonic.models.ArtistWithAlbumsID3
-import com.cappielloantonio.play.subsonic.models.SimilarArtistID3
-import com.cappielloantonio.play.util.MappingUtil
 import kotlinx.android.parcel.Parcelize
 
 @Keep
 @Parcelize
-class Artist(
-    val id: String?,
-    val name: String?,
-    val primary: String?,
-    val albumCount: Int?,
-    var starred: Boolean?,
-    val bio: String?,
-    val imageUrl: String?,
-    val lastfm: String?,
-    val albums: List<Album>?,
-    val similarArtists: List<Artist>?,
-) : Parcelable {
-
-    constructor(artistID3: ArtistID3) : this(
-        artistID3.id,
-        artistID3.name,
-        artistID3.coverArtId,
-        artistID3.albumCount,
-        artistID3.starred != null,
-        null,
-        null,
-        null,
-        null,
-        null
-    )
-
-    constructor(artistWithAlbumsID3: ArtistWithAlbumsID3) : this(
-        artistWithAlbumsID3.id,
-        artistWithAlbumsID3.name,
-        artistWithAlbumsID3.coverArtId,
-        artistWithAlbumsID3.albumCount,
-        artistWithAlbumsID3.starred != null,
-        null,
-        null,
-        null,
-        MappingUtil.mapAlbum(artistWithAlbumsID3.albums),
-        null
-    )
-
-    constructor(similarArtistID3: SimilarArtistID3) : this(
-        similarArtistID3.id,
-        similarArtistID3.name,
-        similarArtistID3.coverArtId,
-        similarArtistID3.albumCount,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null
-    )
-
-    constructor(artistInfo2: ArtistInfo2) : this(
-        null,
-        null,
-        null,
-        null,
-        null,
-        artistInfo2.biography,
-        artistInfo2.largeImageUrl,
-        artistInfo2.lastFmUrl,
-        null,
-        MappingUtil.mapSimilarArtist(artistInfo2.similarArtists)
-    )
-
-    constructor(id: String, name: String) : this(
-        id,
-        name,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null
-    )
-
-    constructor(download: Download) : this(
-        download.artistId,
-        download.artistName
-    )
-
+class Artist : Parcelable {
     companion object {
         const val DOWNLOADED = "DOWNLOADED"
         const val STARRED = "STARRED"
diff --git a/app/src/main/java/com/cappielloantonio/play/model/Chronology.kt b/app/src/main/java/com/cappielloantonio/play/model/Chronology.kt
index c5ed29e3..694c135b 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Chronology.kt
+++ b/app/src/main/java/com/cappielloantonio/play/model/Chronology.kt
@@ -1,55 +1,19 @@
 package com.cappielloantonio.play.model
 
-import android.os.Parcelable
 import androidx.annotation.Keep
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import com.cappielloantonio.play.subsonic.models.Child
 import kotlinx.android.parcel.Parcelize
 
 @Keep
 @Parcelize
 @Entity(tableName = "chronology")
-data class Chronology(
-    @ColumnInfo(name = "id")
-    val trackId: String,
-
-    @ColumnInfo(name = "title")
-    val title: String,
-
-    @ColumnInfo(name = "albumId")
-    val albumId: String,
-
-    @ColumnInfo(name = "albumName")
-    val albumName: String,
-
-    @ColumnInfo(name = "artistId")
-    val artistId: String,
-
-    @ColumnInfo(name = "artistName")
-    val artistName: String,
-
-    @ColumnInfo(name = "cover_art_id")
-    val coverArtId: String,
-
-    @ColumnInfo(name = "duration")
-    val duration: Long,
-
-    @ColumnInfo(name = "container")
-    val container: String,
-
-    @ColumnInfo(name = "bitrate")
-    val bitrate: Int,
-
-    @ColumnInfo(name = "extension")
-    val extension: String,
-
-    @ColumnInfo(name = "server")
-    val server: String,
-) : Parcelable {
-    @PrimaryKey(autoGenerate = true)
-    var uuid: Int = 0
-
+class Chronology(@PrimaryKey override val id: String) : Child(id) {
     @ColumnInfo(name = "timestamp")
     var timestamp: Long = System.currentTimeMillis()
+
+    @ColumnInfo(name = "server")
+    var server: String? = null
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/model/Download.kt b/app/src/main/java/com/cappielloantonio/play/model/Download.kt
index a84b8b25..4f48839d 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Download.kt
+++ b/app/src/main/java/com/cappielloantonio/play/model/Download.kt
@@ -1,89 +1,22 @@
 package com.cappielloantonio.play.model
 
-import android.os.Parcelable
 import androidx.annotation.Keep
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.cappielloantonio.play.App
-import com.cappielloantonio.play.util.MusicUtil
-import com.cappielloantonio.play.util.PreferenceUtil
+import com.cappielloantonio.play.subsonic.models.Child
 import kotlinx.android.parcel.Parcelize
-import java.util.*
 
 @Keep
 @Parcelize
 @Entity(tableName = "download")
-class Download(
-    @PrimaryKey @ColumnInfo(name = "id")
-    var id: String,
+class Download(@PrimaryKey override val id: String) : Child(id) {
+    @ColumnInfo(name = "media_id")
+    var mediaID: String? = null
 
-    @ColumnInfo(name = "mediaId")
-    val mediaID: String,
+    @ColumnInfo
+    var server: String? = null
 
-    @ColumnInfo(name = "title")
-    val title: String,
-
-    @ColumnInfo(name = "albumId")
-    val albumId: String,
-
-    @ColumnInfo(name = "albumName")
-    val albumName: String,
-
-    @ColumnInfo(name = "artistId")
-    val artistId: String,
-
-    @ColumnInfo(name = "artistName")
-    val artistName: String,
-
-    @ColumnInfo(name = "trackNumber")
-    val trackNumber: Int = 0,
-
-    @ColumnInfo(name = "primary")
-    val primary: String,
-
-    @ColumnInfo(name = "duration")
-    val duration: Long = 0,
-
-    @ColumnInfo(name = "server")
-    val server: String,
-
-    @ColumnInfo(name = "playlistId")
-    val playlistId: String? = null,
-
-    @ColumnInfo(name = "playlistName")
-    val playlistName: String? = null,
-
-    @ColumnInfo(name = "container")
-    val container: String,
-
-    @ColumnInfo(name = "bitrate")
-    val bitrate: Int = 0,
-
-    @ColumnInfo(name = "extension")
-    val extension: String,
-
-    @ColumnInfo(name = "type")
-    val type: String,
-) : Parcelable {
-
-    constructor(media: Media, playlistId: String?, playlistName: String?) : this(
-        UUID.randomUUID().toString(),
-        media.id!!,
-        media.title!!,
-        media.albumId!!,
-        media.albumName!!,
-        media.artistId!!,
-        MusicUtil.normalizedArtistName(media.artistName),
-        media.trackNumber!!,
-        media.coverArtId!!,
-        media.duration!!,
-        PreferenceUtil.getInstance(App.getInstance()).serverId,
-        playlistId,
-        playlistName,
-        media.container!!,
-        media.bitrate,
-        media.extension!!,
-        media.type!!
-    )
+    @ColumnInfo(name = "playlist_id")
+    var playlistId: String? = null
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/model/Genre.kt b/app/src/main/java/com/cappielloantonio/play/model/Genre.kt
index 3d55a451..c82c4c5a 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Genre.kt
+++ b/app/src/main/java/com/cappielloantonio/play/model/Genre.kt
@@ -2,25 +2,11 @@ package com.cappielloantonio.play.model
 
 import android.os.Parcelable
 import androidx.annotation.Keep
-import com.cappielloantonio.play.subsonic.models.Genre
 import kotlinx.android.parcel.Parcelize
 
 @Keep
 @Parcelize
-class Genre(
-    val id: String,
-    val name: String,
-    val songCount: Int = 0,
-    val albumCount: Int = 0
-) : Parcelable {
-
-    constructor(genre: Genre) : this(
-        genre.genre,
-        genre.genre,
-        genre.songCount,
-        genre.albumCount
-    )
-
+class Genre : Parcelable {
     companion object {
         const val ORDER_BY_NAME = "ORDER_BY_NAME"
         const val ORDER_BY_RANDOM = "ORDER_BY_RANDOM"
diff --git a/app/src/main/java/com/cappielloantonio/play/model/Media.kt b/app/src/main/java/com/cappielloantonio/play/model/Media.kt
index 389de2f3..1943e891 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Media.kt
+++ b/app/src/main/java/com/cappielloantonio/play/model/Media.kt
@@ -2,192 +2,11 @@ package com.cappielloantonio.play.model
 
 import android.os.Parcelable
 import androidx.annotation.Keep
-import com.cappielloantonio.play.subsonic.models.Child
-import com.cappielloantonio.play.subsonic.models.PodcastEpisode
 import kotlinx.android.parcel.Parcelize
 
 @Keep
 @Parcelize
-class Media(
-    val id: String?,
-    val title: String?,
-    val channelId: String?,
-    val streamId: String?,
-    val albumId: String?,
-    val albumName: String?,
-    val artistId: String?,
-    val artistName: String?,
-    val coverArtId: String?,
-    val trackNumber: Int?,
-    val discNumber: Int?,
-    val year: Int?,
-    val duration: Long?,
-    val description: String?,
-    val status: String?,
-    var starred: Boolean?,
-    val path: String?,
-    val size: Long?,
-    val container: String?,
-    val bitrate: Int,
-    val extension: String?,
-    val added: Long?,
-    val type: String?,
-    val playCount: Int?,
-    val lastPlay: Long?,
-    val rating: Int?,
-    val publishDate: Long?
-) : Parcelable {
-
-    constructor(child: Child) : this(
-        child.id,
-        child.title,
-        null,
-        null,
-        child.albumId,
-        child.album,
-        child.artistId,
-        child.artist,
-        child.coverArtId,
-        child.track,
-        child.discNumber,
-        child.year,
-        child.duration.toLong(),
-        null,
-        null,
-        child.starred != null,
-        child.path,
-        child.size,
-        child.contentType,
-        child.bitRate,
-        child.suffix,
-        child.created.time,
-        child.type,
-        0,
-        0,
-        child.userRating,
-        0
-    )
-
-    constructor(podcastEpisode: PodcastEpisode) : this(
-        podcastEpisode.id,
-        podcastEpisode.title,
-        podcastEpisode.channelId,
-        podcastEpisode.streamId,
-        null,
-        podcastEpisode.album,
-        null,
-        podcastEpisode.artist,
-        podcastEpisode.coverArtId,
-        podcastEpisode.track,
-        null,
-        podcastEpisode.year,
-        podcastEpisode.duration.toLong(),
-        podcastEpisode.description,
-        podcastEpisode.status,
-        podcastEpisode.starred != null,
-        null,
-        null,
-        podcastEpisode.contentType,
-        podcastEpisode.bitRate,
-        podcastEpisode.suffix,
-        podcastEpisode.created.time,
-        podcastEpisode.type,
-        null,
-        null,
-        podcastEpisode.userRating,
-        podcastEpisode.publishDate.time
-    )
-
-    constructor(queue: Queue) : this(
-        queue.id,
-        queue.title,
-        queue.channelId,
-        queue.streamId,
-        queue.albumId,
-        queue.albumName,
-        queue.artistId,
-        queue.artistName,
-        queue.coverArtId,
-        null,
-        null,
-        null,
-        queue.duration,
-        null,
-        null,
-        null,
-        null,
-        null,
-        queue.container,
-        queue.bitrate,
-        queue.extension,
-        null,
-        queue.type,
-        null,
-        null,
-        null,
-        queue.publishingDate
-    )
-
-    constructor(download: Download) : this(
-        download.mediaID,
-        download.title,
-        null,
-        null,
-        download.albumId,
-        download.albumName,
-        download.artistId,
-        download.artistName,
-        download.primary,
-        download.trackNumber,
-        null,
-        null,
-        download.duration,
-        null,
-        null,
-        null,
-        null,
-        null,
-        download.container,
-        download.bitrate,
-        download.extension,
-        null,
-        download.type,
-        null,
-        null,
-        null,
-        null
-    )
-
-    constructor(item: Chronology) : this(
-        item.trackId,
-        item.title,
-        null,
-        null,
-        item.albumId,
-        item.albumName,
-        item.artistId,
-        item.artistName,
-        item.coverArtId,
-        null,
-        null,
-        null,
-        item.duration,
-        null,
-        null,
-        null,
-        null,
-        null,
-        item.container,
-        item.bitrate,
-        item.extension,
-        null,
-        MEDIA_TYPE_MUSIC,
-        null,
-        null,
-        null,
-        null
-    )
-
+class Media : Parcelable {
     companion object {
         const val MEDIA_TYPE_MUSIC = "music"
         const val MEDIA_TYPE_PODCAST = "podcast"
diff --git a/app/src/main/java/com/cappielloantonio/play/model/Playlist.kt b/app/src/main/java/com/cappielloantonio/play/model/Playlist.kt
index 43284ee5..b86089c7 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Playlist.kt
+++ b/app/src/main/java/com/cappielloantonio/play/model/Playlist.kt
@@ -2,45 +2,11 @@ package com.cappielloantonio.play.model
 
 import android.os.Parcelable
 import androidx.annotation.Keep
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.Ignore
-import androidx.room.PrimaryKey
-import com.cappielloantonio.play.subsonic.models.Playlist
 import kotlinx.android.parcel.Parcelize
 
 @Keep
 @Parcelize
-@Entity(tableName = "playlist")
-class Playlist(
-    @PrimaryKey
-    @ColumnInfo(name = "id")
-    var id: String,
-
-    @ColumnInfo(name = "playlist_name")
-    var name: String,
-
-    @ColumnInfo(name = "primary")
-    var primary: String? = null,
-
-    @ColumnInfo(name = "song_count")
-    var songCount: Int = 0,
-
-    @ColumnInfo(name = "playlist_duration")
-    var duration: Long = 0,
-
-    @ColumnInfo(name = "server")
-    var server: String? = null,
-) : Parcelable {
-
-    constructor(playlist: Playlist) : this(
-        playlist.id,
-        playlist.name,
-        playlist.coverArtId,
-        playlist.songCount,
-        playlist.duration.toLong()
-    )
-
+class Playlist : Parcelable {
     companion object {
         const val ALL = "ALL"
         const val DOWNLOADED = "DOWNLOADED"
diff --git a/app/src/main/java/com/cappielloantonio/play/model/PodcastChannel.kt b/app/src/main/java/com/cappielloantonio/play/model/PodcastChannel.kt
deleted file mode 100644
index 909d9f28..00000000
--- a/app/src/main/java/com/cappielloantonio/play/model/PodcastChannel.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.cappielloantonio.play.model
-
-import android.os.Parcelable
-import androidx.annotation.Keep
-import com.cappielloantonio.play.subsonic.models.PodcastChannel
-import com.cappielloantonio.play.util.MappingUtil
-import kotlinx.android.parcel.Parcelize
-
-@Keep
-@Parcelize
-class PodcastChannel(
-    var id: String,
-    var url: String,
-    var title: String,
-    var description: String,
-    var coverArtId: String,
-    var originalImageUrl: String,
-    var status: String,
-    var errorMessage: String,
-    var episodes: List<Media>,
-) : Parcelable {
-
-    constructor(podcastChannel: PodcastChannel) : this(
-        podcastChannel.id,
-        podcastChannel.url,
-        podcastChannel.title,
-        podcastChannel.description,
-        podcastChannel.coverArtId,
-        podcastChannel.originalImageUrl,
-        podcastChannel.status,
-        podcastChannel.errorMessage,
-        MappingUtil.mapPodcastEpisode(podcastChannel.episodes)
-    )
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/model/Queue.kt b/app/src/main/java/com/cappielloantonio/play/model/Queue.kt
index bfd6d0c1..c66c29e4 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Queue.kt
+++ b/app/src/main/java/com/cappielloantonio/play/model/Queue.kt
@@ -1,68 +1,26 @@
 package com.cappielloantonio.play.model
 
-import android.os.Parcelable
 import androidx.annotation.Keep
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import com.cappielloantonio.play.subsonic.models.Child
 import kotlinx.android.parcel.Parcelize
 
 @Keep
 @Parcelize
 @Entity(tableName = "queue")
-data class Queue(
-    @PrimaryKey
+class Queue(override val id: String) : Child(id) {
+    @PrimaryKey(autoGenerate = true)
     @ColumnInfo(name = "track_order")
-    val trackOrder: Int,
-
-    @ColumnInfo(name = "id")
-    val id: String?,
-
-    @ColumnInfo(name = "title")
-    val title: String?,
-
-    @ColumnInfo(name = "albumId")
-    val albumId: String?,
-
-    @ColumnInfo(name = "albumName")
-    val albumName: String?,
-
-    @ColumnInfo(name = "artistId")
-    val artistId: String?,
-
-    @ColumnInfo(name = "artistName")
-    val artistName: String?,
-
-    @ColumnInfo(name = "cover_art_id")
-    val coverArtId: String?,
-
-    @ColumnInfo(name = "duration")
-    val duration: Long,
+    var trackOrder: Int = 0
 
     @ColumnInfo(name = "last_play", defaultValue = "0")
-    val lastPlay: Long,
+    var lastPlay: Long = 0
 
     @ColumnInfo(name = "playing_changed", defaultValue = "0")
-    val playingChanged: Long,
+    var playingChanged: Long = 0
 
     @ColumnInfo(name = "stream_id")
-    val streamId: String?,
-
-    @ColumnInfo(name = "channel_id")
-    val channelId: String?,
-
-    @ColumnInfo(name = "publishing_date", defaultValue = "0")
-    val publishingDate: Long,
-
-    @ColumnInfo(name = "container")
-    val container: String?,
-
-    @ColumnInfo(name = "bitrate")
-    val bitrate: Int,
-
-    @ColumnInfo(name = "extension")
-    val extension: String?,
-
-    @ColumnInfo(name = "media_type")
-    val type: String?
-) : Parcelable
\ No newline at end of file
+    var streamId: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/repository/AlbumRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/AlbumRepository.java
index 2b16c483..12f8b597 100644
--- a/app/src/main/java/com/cappielloantonio/play/repository/AlbumRepository.java
+++ b/app/src/main/java/com/cappielloantonio/play/repository/AlbumRepository.java
@@ -8,10 +8,9 @@ import androidx.lifecycle.MutableLiveData;
 import com.cappielloantonio.play.App;
 import com.cappielloantonio.play.interfaces.DecadesCallback;
 import com.cappielloantonio.play.interfaces.MediaCallback;
-import com.cappielloantonio.play.model.Album;
-import com.cappielloantonio.play.model.Media;
+import com.cappielloantonio.play.subsonic.models.AlbumID3;
+import com.cappielloantonio.play.subsonic.models.Child;
 import com.cappielloantonio.play.subsonic.models.SubsonicResponse;
-import com.cappielloantonio.play.util.MappingUtil;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -32,8 +31,8 @@ public class AlbumRepository {
         this.application = application;
     }
 
-    public MutableLiveData<List<Album>> getAlbums(String type, int size, Integer fromYear, Integer toYear) {
-        MutableLiveData<List<Album>> listLiveAlbums = new MutableLiveData<>();
+    public MutableLiveData<List<AlbumID3>> getAlbums(String type, int size, Integer fromYear, Integer toYear) {
+        MutableLiveData<List<AlbumID3>> listLiveAlbums = new MutableLiveData<>(new ArrayList<>());
 
         App.getSubsonicClientInstance(application, false)
                 .getAlbumSongListClient()
@@ -41,13 +40,9 @@ public class AlbumRepository {
                 .enqueue(new Callback<SubsonicResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
-                        List<Album> albums = new ArrayList<>();
-
                         if (response.isSuccessful() && response.body() != null && response.body().getAlbumList2() != null) {
-                            albums.addAll(MappingUtil.mapAlbum(response.body().getAlbumList2().getAlbums()));
+                            listLiveAlbums.setValue(response.body().getAlbumList2().getAlbums());
                         }
-
-                        listLiveAlbums.setValue(albums);
                     }
 
                     @Override
@@ -59,8 +54,8 @@ public class AlbumRepository {
         return listLiveAlbums;
     }
 
-    public MutableLiveData<List<Album>> getStarredAlbums(boolean random, int size) {
-        MutableLiveData<List<Album>> starredAlbums = new MutableLiveData<>();
+    public MutableLiveData<List<AlbumID3>> getStarredAlbums(boolean random, int size) {
+        MutableLiveData<List<AlbumID3>> starredAlbums = new MutableLiveData<>(new ArrayList<>());
 
         App.getSubsonicClientInstance(application, false)
                 .getAlbumSongListClient()
@@ -69,13 +64,13 @@ public class AlbumRepository {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getStarred2() != null) {
-                            List<Album> albums = new ArrayList<>(MappingUtil.mapAlbum(response.body().getStarred2().getAlbums()));
+                            List<AlbumID3> albums = response.body().getStarred2().getAlbums();
 
-                            if (!random) {
-                                starredAlbums.setValue(albums);
-                            } else {
+                            if (random) {
                                 Collections.shuffle(albums);
                                 starredAlbums.setValue(albums.subList(0, Math.min(size, albums.size())));
+                            } else {
+                                starredAlbums.setValue(albums);
                             }
                         }
                     }
@@ -140,8 +135,8 @@ public class AlbumRepository {
                 });
     }
 
-    public MutableLiveData<List<Media>> getAlbumTracks(String id) {
-        MutableLiveData<List<Media>> albumTracks = new MutableLiveData<>();
+    public MutableLiveData<List<Child>> getAlbumTracks(String id) {
+        MutableLiveData<List<Child>> albumTracks = new MutableLiveData<>();
 
         App.getSubsonicClientInstance(application, false)
                 .getBrowsingClient()
@@ -149,10 +144,10 @@ public class AlbumRepository {
                 .enqueue(new Callback<SubsonicResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
-                        List<Media> tracks = new ArrayList<>();
+                        List<Child> tracks = new ArrayList<>();
 
                         if (response.isSuccessful() && response.body() != null && response.body().getAlbum() != null) {
-                            tracks.addAll(MappingUtil.mapSong(response.body().getAlbum().getSongs()));
+                            tracks.addAll(response.body().getAlbum().getSongs());
                         }
 
                         albumTracks.setValue(tracks);
@@ -167,8 +162,8 @@ public class AlbumRepository {
         return albumTracks;
     }
 
-    public MutableLiveData<List<Album>> getArtistAlbums(String id) {
-        MutableLiveData<List<Album>> artistsAlbum = new MutableLiveData<>();
+    public MutableLiveData<List<AlbumID3>> getArtistAlbums(String id) {
+        MutableLiveData<List<AlbumID3>> artistsAlbum = new MutableLiveData<>(new ArrayList<>());
 
         App.getSubsonicClientInstance(application, false)
                 .getBrowsingClient()
@@ -176,14 +171,11 @@ public class AlbumRepository {
                 .enqueue(new Callback<SubsonicResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
-                        List<Album> albums = new ArrayList<>();
-
                         if (response.isSuccessful() && response.body() != null && response.body().getArtist() != null) {
-                            albums.addAll(MappingUtil.mapAlbum(response.body().getArtist().getAlbums()));
-                            albums.sort(Comparator.comparing(Album::getYear));
+                            List<AlbumID3> albums = response.body().getArtist().getAlbums();
+                            albums.sort(Comparator.comparing(AlbumID3::getYear));
+                            artistsAlbum.setValue(albums);
                         }
-
-                        artistsAlbum.setValue(albums);
                     }
 
                     @Override
@@ -195,8 +187,8 @@ public class AlbumRepository {
         return artistsAlbum;
     }
 
-    public MutableLiveData<Album> getAlbum(String id) {
-        MutableLiveData<Album> album = new MutableLiveData<>();
+    public MutableLiveData<AlbumID3> getAlbum(String id) {
+        MutableLiveData<AlbumID3> album = new MutableLiveData<>();
 
         App.getSubsonicClientInstance(application, false)
                 .getBrowsingClient()
@@ -205,7 +197,7 @@ public class AlbumRepository {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getAlbum() != null) {
-                            album.setValue(MappingUtil.mapAlbum(response.body().getAlbum()));
+                            album.setValue(response.body().getAlbum());
                         }
                     }
 
@@ -218,17 +210,17 @@ public class AlbumRepository {
         return album;
     }
 
-    public void getInstantMix(Album album, int count, MediaCallback callback) {
+    public void getInstantMix(AlbumID3 album, int count, MediaCallback callback) {
         App.getSubsonicClientInstance(application, false)
                 .getBrowsingClient()
                 .getSimilarSongs2(album.getId(), count)
                 .enqueue(new Callback<SubsonicResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
-                        List<Media> songs = new ArrayList<>();
+                        List<Child> songs = new ArrayList<>();
 
                         if (response.isSuccessful() && response.body() != null && response.body().getSimilarSongs2() != null) {
-                            songs.addAll(MappingUtil.mapSong(response.body().getSimilarSongs2().getSongs()));
+                            songs.addAll(response.body().getSimilarSongs2().getSongs());
                         }
 
                         callback.onLoadMedia(songs);
diff --git a/app/src/main/java/com/cappielloantonio/play/repository/ArtistRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/ArtistRepository.java
index 00a68b6b..e2b6f184 100644
--- a/app/src/main/java/com/cappielloantonio/play/repository/ArtistRepository.java
+++ b/app/src/main/java/com/cappielloantonio/play/repository/ArtistRepository.java
@@ -3,18 +3,16 @@ package com.cappielloantonio.play.repository;
 import android.app.Application;
 
 import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.MutableLiveData;
 
 import com.cappielloantonio.play.App;
-import com.cappielloantonio.play.interfaces.MediaCallback;
-import com.cappielloantonio.play.model.Album;
-import com.cappielloantonio.play.model.Artist;
-import com.cappielloantonio.play.model.Media;
+import com.cappielloantonio.play.subsonic.models.AlbumID3;
+import com.cappielloantonio.play.subsonic.models.ArtistID3;
+import com.cappielloantonio.play.subsonic.models.ArtistInfo2;
+import com.cappielloantonio.play.subsonic.models.Child;
 import com.cappielloantonio.play.subsonic.models.IndexID3;
 import com.cappielloantonio.play.subsonic.models.SubsonicResponse;
-import com.cappielloantonio.play.util.MappingUtil;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -31,8 +29,8 @@ public class ArtistRepository {
         this.application = application;
     }
 
-    public MutableLiveData<List<Artist>> getStarredArtists(boolean random, int size) {
-        MutableLiveData<List<Artist>> starredArtists = new MutableLiveData<>();
+    public MutableLiveData<List<ArtistID3>> getStarredArtists(boolean random, int size) {
+        MutableLiveData<List<ArtistID3>> starredArtists = new MutableLiveData<>();
 
         App.getSubsonicClientInstance(application, false)
                 .getAlbumSongListClient()
@@ -41,7 +39,7 @@ public class ArtistRepository {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getStarred2() != null) {
-                            List<Artist> artists = new ArrayList<>(MappingUtil.mapArtist(response.body().getStarred2().getArtists()));
+                            List<ArtistID3> artists = response.body().getStarred2().getArtists();
 
                             if (!random) {
                                 getArtistInfo(artists, starredArtists);
@@ -61,8 +59,8 @@ public class ArtistRepository {
         return starredArtists;
     }
 
-    public MutableLiveData<List<Artist>> getArtists(boolean random, int size) {
-        MutableLiveData<List<Artist>> listLiveArtists = new MutableLiveData<>();
+    public MutableLiveData<List<ArtistID3>> getArtists(boolean random, int size) {
+        MutableLiveData<List<ArtistID3>> listLiveArtists = new MutableLiveData<>();
 
         App.getSubsonicClientInstance(application, false)
                 .getBrowsingClient()
@@ -71,10 +69,10 @@ public class ArtistRepository {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null) {
-                            List<Artist> artists = new ArrayList<>();
+                            List<ArtistID3> artists = new ArrayList<>();
 
                             for (IndexID3 index : response.body().getArtists().getIndices()) {
-                                artists.addAll(MappingUtil.mapArtist(index.getArtists()));
+                                artists.addAll(index.getArtists());
                             }
 
                             if (random) {
@@ -97,12 +95,12 @@ public class ArtistRepository {
     /*
      * Metodo che mi restituisce le informazioni essenzionali dell'artista (cover, numero di album...)
      */
-    public void getArtistInfo(List<Artist> artists, MutableLiveData<List<Artist>> list) {
-        List<Artist> liveArtists = list.getValue();
+    public void getArtistInfo(List<ArtistID3> artists, MutableLiveData<List<ArtistID3>> list) {
+        List<ArtistID3> liveArtists = list.getValue();
         if (liveArtists == null) liveArtists = new ArrayList<>();
         list.setValue(liveArtists);
 
-        for (Artist artist : artists) {
+        for (ArtistID3 artist : artists) {
             App.getSubsonicClientInstance(application, false)
                     .getBrowsingClient()
                     .getArtist(artist.getId())
@@ -110,7 +108,7 @@ public class ArtistRepository {
                         @Override
                         public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                             if (response.isSuccessful() && response.body() != null && response.body().getArtist() != null) {
-                                addToMutableLiveData(list, MappingUtil.mapArtistWithAlbum(response.body().getArtist()));
+                                addToMutableLiveData(list, response.body().getArtist());
                             }
                         }
 
@@ -122,8 +120,8 @@ public class ArtistRepository {
         }
     }
 
-    public MutableLiveData<Artist> getArtistInfo(String id) {
-        MutableLiveData<Artist> artist = new MutableLiveData<>();
+    public MutableLiveData<ArtistID3> getArtistInfo(String id) {
+        MutableLiveData<ArtistID3> artist = new MutableLiveData<>();
 
         App.getSubsonicClientInstance(application, false)
                 .getBrowsingClient()
@@ -132,7 +130,7 @@ public class ArtistRepository {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getArtist() != null) {
-                            artist.setValue(MappingUtil.mapArtistWithAlbum(response.body().getArtist()));
+                            artist.setValue(response.body().getArtist());
                         }
                     }
 
@@ -148,8 +146,8 @@ public class ArtistRepository {
     /*
      * Metodo che mi restituisce le informazioni complete dell'artista (bio, immagini prese da last.fm, artisti simili...)
      */
-    public MutableLiveData<Artist> getArtistFullInfo(String id) {
-        MutableLiveData<Artist> artistFullInfo = new MutableLiveData<>();
+    public MutableLiveData<ArtistInfo2> getArtistFullInfo(String id) {
+        MutableLiveData<ArtistInfo2> artistFullInfo = new MutableLiveData<>();
 
         App.getSubsonicClientInstance(application, false)
                 .getBrowsingClient()
@@ -158,7 +156,7 @@ public class ArtistRepository {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getArtistInfo2() != null) {
-                            artistFullInfo.setValue(MappingUtil.mapArtist(response.body().getArtistInfo2()));
+                            artistFullInfo.setValue(response.body().getArtistInfo2());
                         }
                     }
 
@@ -222,8 +220,8 @@ public class ArtistRepository {
                 });
     }
 
-    public MutableLiveData<Artist> getArtist(String id) {
-        MutableLiveData<Artist> artist = new MutableLiveData<>();
+    public MutableLiveData<ArtistID3> getArtist(String id) {
+        MutableLiveData<ArtistID3> artist = new MutableLiveData<>();
 
         App.getSubsonicClientInstance(application, false)
                 .getBrowsingClient()
@@ -232,7 +230,7 @@ public class ArtistRepository {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getArtist() != null) {
-                            artist.setValue(MappingUtil.mapArtist(response.body().getArtist()));
+                            artist.setValue(response.body().getArtist());
                         }
                     }
 
@@ -245,8 +243,8 @@ public class ArtistRepository {
         return artist;
     }
 
-    public MutableLiveData<ArrayList<Media>> getInstantMix(Artist artist, int count) {
-        MutableLiveData<ArrayList<Media>> instantMix = new MutableLiveData<>();
+    public MutableLiveData<List<Child>> getInstantMix(ArtistID3 artist, int count) {
+        MutableLiveData<List<Child>> instantMix = new MutableLiveData<>();
 
         App.getSubsonicClientInstance(application, false)
                 .getBrowsingClient()
@@ -255,7 +253,7 @@ public class ArtistRepository {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getSimilarSongs2() != null) {
-                            instantMix.setValue(MappingUtil.mapSong(response.body().getSimilarSongs2().getSongs()));
+                            instantMix.setValue(response.body().getSimilarSongs2().getSongs());
                         }
                     }
 
@@ -268,8 +266,8 @@ public class ArtistRepository {
         return instantMix;
     }
 
-    public MutableLiveData<ArrayList<Media>> getArtistRandomSong(LifecycleOwner owner, Artist artist, int count) {
-        MutableLiveData<ArrayList<Media>> randomSongs = new MutableLiveData<>();
+    public MutableLiveData<ArrayList<Child>> getArtistRandomSong(LifecycleOwner owner, ArtistID3 artist, int count) {
+        MutableLiveData<ArrayList<Child>> randomSongs = new MutableLiveData<>();
 
         App.getSubsonicClientInstance(application, false)
                 .getBrowsingClient()
@@ -278,14 +276,14 @@ public class ArtistRepository {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getArtist() != null && response.body().getArtist().getAlbums() != null) {
-                            List<Album> albums = new ArrayList<>(MappingUtil.mapAlbum(response.body().getArtist().getAlbums()));
+                            List<AlbumID3> albums = response.body().getArtist().getAlbums();
 
                             if (albums.size() > 0) {
                                 AlbumRepository albumRepository = new AlbumRepository(App.getInstance());
 
                                 for (int index = 0; index < albums.size(); index++) {
                                     albumRepository.getAlbumTracks(albums.get(index).getId()).observe(owner, songs -> {
-                                        ArrayList<Media> liveSongs = randomSongs.getValue();
+                                        ArrayList<Child> liveSongs = randomSongs.getValue();
                                         if (liveSongs == null) liveSongs = new ArrayList<>();
                                         Collections.shuffle(liveSongs);
                                         liveSongs.addAll(songs);
@@ -305,8 +303,8 @@ public class ArtistRepository {
         return randomSongs;
     }
 
-    public MutableLiveData<List<Media>> getTopSongs(String artistName, int count) {
-        MutableLiveData<List<Media>> topSongs = new MutableLiveData<>();
+    public MutableLiveData<List<Child>> getTopSongs(String artistName, int count) {
+        MutableLiveData<List<Child>> topSongs = new MutableLiveData<>();
 
         App.getSubsonicClientInstance(application, false)
                 .getBrowsingClient()
@@ -315,7 +313,7 @@ public class ArtistRepository {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getTopSongs() != null) {
-                            topSongs.setValue(MappingUtil.mapSong(response.body().getTopSongs().getSongs()));
+                            topSongs.setValue(response.body().getTopSongs().getSongs());
                         }
                     }
 
@@ -328,8 +326,8 @@ public class ArtistRepository {
         return topSongs;
     }
 
-    private void addToMutableLiveData(MutableLiveData<List<Artist>> liveData, Artist artist) {
-        List<Artist> liveArtists = liveData.getValue();
+    private void addToMutableLiveData(MutableLiveData<List<ArtistID3>> liveData, ArtistID3 artist) {
+        List<ArtistID3> liveArtists = liveData.getValue();
         if (liveArtists != null) liveArtists.add(artist);
         liveData.setValue(liveArtists);
     }
diff --git a/app/src/main/java/com/cappielloantonio/play/repository/DownloadRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/DownloadRepository.java
index 034e4ad6..ee4d7fed 100644
--- a/app/src/main/java/com/cappielloantonio/play/repository/DownloadRepository.java
+++ b/app/src/main/java/com/cappielloantonio/play/repository/DownloadRepository.java
@@ -4,17 +4,14 @@ import android.app.Application;
 
 import androidx.lifecycle.LiveData;
 
-import com.cappielloantonio.play.App;
 import com.cappielloantonio.play.database.AppDatabase;
 import com.cappielloantonio.play.database.dao.DownloadDao;
 import com.cappielloantonio.play.model.Download;
-import com.cappielloantonio.play.util.PreferenceUtil;
+import com.cappielloantonio.play.util.Preferences;
 
 import java.util.List;
 
 public class DownloadRepository {
-    private static final String TAG = "QueueRepository";
-
     private final DownloadDao downloadDao;
 
     public DownloadRepository(Application application) {
@@ -23,31 +20,31 @@ public class DownloadRepository {
     }
 
     public LiveData<List<Download>> getLiveDownload() {
-        return downloadDao.getAll(PreferenceUtil.getInstance(App.getInstance()).getServerId());
+        return downloadDao.getAll(Preferences.getServerId());
     }
 
     public LiveData<List<Download>> getLiveDownloadSample(int size, boolean isArtist, boolean isAlbum, boolean isTrack, boolean isPlaylist) {
-        if (isArtist) return downloadDao.getSampleArtist(size, PreferenceUtil.getInstance(App.getInstance()).getServerId());
-        else if (isAlbum) return downloadDao.getSampleAlbum(size, PreferenceUtil.getInstance(App.getInstance()).getServerId());
-        else if (isTrack) return downloadDao.getSample(size, PreferenceUtil.getInstance(App.getInstance()).getServerId());
-        else if (isPlaylist) return downloadDao.getSamplePlaylist(size, PreferenceUtil.getInstance(App.getInstance()).getServerId());
-        else return downloadDao.getSample(size, PreferenceUtil.getInstance(App.getInstance()).getServerId());
+        if (isArtist) return downloadDao.getSampleArtist(size, Preferences.getServerId());
+        else if (isAlbum) return downloadDao.getSampleAlbum(size, Preferences.getServerId());
+        else if (isTrack) return downloadDao.getSample(size, Preferences.getServerId());
+        else if (isPlaylist) return downloadDao.getSamplePlaylist(size, Preferences.getServerId());
+        else return downloadDao.getSample(size, Preferences.getServerId());
     }
 
     public LiveData<List<Download>> getLiveDownloadFromArtist(String artistId) {
-        return downloadDao.getAllFromArtist(PreferenceUtil.getInstance(App.getInstance()).getServerId(), artistId);
+        return downloadDao.getAllFromArtist(Preferences.getServerId(), artistId);
     }
 
     public LiveData<List<Download>> getLiveDownloadFromAlbum(String albumId) {
-        return downloadDao.getAllFromAlbum(PreferenceUtil.getInstance(App.getInstance()).getServerId(), albumId);
+        return downloadDao.getAllFromAlbum(Preferences.getServerId(), albumId);
     }
 
     public LiveData<List<Download>> getLiveDownloadFromPlaylist(String playlistId) {
-        return downloadDao.getAllFromPlaylist(PreferenceUtil.getInstance(App.getInstance()).getServerId(), playlistId);
+        return downloadDao.getAllFromPlaylist(Preferences.getServerId(), playlistId);
     }
 
     public LiveData<List<Download>> getLivePlaylist() {
-        return downloadDao.getAllPlaylists(PreferenceUtil.getInstance(App.getInstance()).getServerId());
+        return downloadDao.getAllPlaylists(Preferences.getServerId());
     }
 
     public void insert(Download download) {
@@ -107,7 +104,7 @@ public class DownloadRepository {
 
         @Override
         public void run() {
-            downloadDao.deleteAll(PreferenceUtil.getInstance(App.getInstance()).getServerId());
+            downloadDao.deleteAll(Preferences.getServerId());
         }
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/repository/GenreRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/GenreRepository.java
index 4abb7a3a..7b935c42 100644
--- a/app/src/main/java/com/cappielloantonio/play/repository/GenreRepository.java
+++ b/app/src/main/java/com/cappielloantonio/play/repository/GenreRepository.java
@@ -6,11 +6,9 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
 
 import com.cappielloantonio.play.App;
-import com.cappielloantonio.play.model.Genre;
+import com.cappielloantonio.play.subsonic.models.Genre;
 import com.cappielloantonio.play.subsonic.models.SubsonicResponse;
-import com.cappielloantonio.play.util.MappingUtil;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -37,7 +35,7 @@ public class GenreRepository {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getGenres() != null) {
-                            List<Genre> genreList = new ArrayList<>(MappingUtil.mapGenre(response.body().getGenres().getGenres()));
+                            List<Genre> genreList = response.body().getGenres().getGenres();
 
                             if (random) {
                                 Collections.shuffle(genreList);
diff --git a/app/src/main/java/com/cappielloantonio/play/repository/PlaylistRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/PlaylistRepository.java
index 1cb9b177..f6ff201c 100644
--- a/app/src/main/java/com/cappielloantonio/play/repository/PlaylistRepository.java
+++ b/app/src/main/java/com/cappielloantonio/play/repository/PlaylistRepository.java
@@ -10,10 +10,9 @@ import androidx.lifecycle.MutableLiveData;
 import com.cappielloantonio.play.App;
 import com.cappielloantonio.play.database.AppDatabase;
 import com.cappielloantonio.play.database.dao.PlaylistDao;
-import com.cappielloantonio.play.model.Playlist;
-import com.cappielloantonio.play.model.Media;
+import com.cappielloantonio.play.subsonic.models.Child;
+import com.cappielloantonio.play.subsonic.models.Playlist;
 import com.cappielloantonio.play.subsonic.models.SubsonicResponse;
-import com.cappielloantonio.play.util.MappingUtil;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -44,7 +43,8 @@ public class PlaylistRepository {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getPlaylists() != null) {
-                            List<Playlist> playlists = new ArrayList<>(MappingUtil.mapPlaylist(response.body().getPlaylists().getPlaylists()));
+                            List<Playlist> playlists = response.body().getPlaylists().getPlaylists();
+
                             if (random) {
                                 Collections.shuffle(playlists);
                                 listLivePlaylists.setValue(playlists.subList(0, Math.min(playlists.size(), size)));
@@ -62,8 +62,8 @@ public class PlaylistRepository {
         return listLivePlaylists;
     }
 
-    public MutableLiveData<List<Media>> getPlaylistSongs(String id) {
-        MutableLiveData<List<Media>> listLivePlaylistSongs = new MutableLiveData<>();
+    public MutableLiveData<List<Child>> getPlaylistSongs(String id) {
+        MutableLiveData<List<Child>> listLivePlaylistSongs = new MutableLiveData<>();
 
         App.getSubsonicClientInstance(application, false)
                 .getPlaylistClient()
@@ -72,7 +72,7 @@ public class PlaylistRepository {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getPlaylist() != null) {
-                            List<Media> songs = new ArrayList<>(MappingUtil.mapSong(response.body().getPlaylist().getEntries()));
+                            List<Child> songs = response.body().getPlaylist().getEntries();
                             listLivePlaylistSongs.setValue(songs);
                         }
                     }
@@ -154,7 +154,8 @@ public class PlaylistRepository {
     }
 
     public LiveData<List<Playlist>> getPinnedPlaylists(String serverId) {
-        return playlistDao.getAll(serverId);
+        // return playlistDao.getAll(serverId);
+        return playlistDao.getAll();
     }
 
     public void insert(Playlist playlist) {
diff --git a/app/src/main/java/com/cappielloantonio/play/repository/PodcastRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/PodcastRepository.java
index 9c267a0e..cc4f8307 100644
--- a/app/src/main/java/com/cappielloantonio/play/repository/PodcastRepository.java
+++ b/app/src/main/java/com/cappielloantonio/play/repository/PodcastRepository.java
@@ -7,10 +7,9 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
 
 import com.cappielloantonio.play.App;
-import com.cappielloantonio.play.model.Media;
-import com.cappielloantonio.play.model.PodcastChannel;
+import com.cappielloantonio.play.subsonic.models.PodcastChannel;
+import com.cappielloantonio.play.subsonic.models.PodcastEpisode;
 import com.cappielloantonio.play.subsonic.models.SubsonicResponse;
-import com.cappielloantonio.play.util.MappingUtil;
 
 import java.util.List;
 
@@ -37,7 +36,7 @@ public class PodcastRepository {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getPodcasts() != null) {
-                            livePodcastChannel.setValue(MappingUtil.mapPodcastChannel(response.body().getPodcasts().getChannels()));
+                            livePodcastChannel.setValue(response.body().getPodcasts().getChannels());
                         }
                     }
 
@@ -50,8 +49,8 @@ public class PodcastRepository {
         return livePodcastChannel;
     }
 
-    public MutableLiveData<List<Media>> getNewestPodcastEpisodes(int count) {
-        MutableLiveData<List<Media>> liveNewestPodcastEpisodes = new MutableLiveData<>();
+    public MutableLiveData<List<PodcastEpisode>> getNewestPodcastEpisodes(int count) {
+        MutableLiveData<List<PodcastEpisode>> liveNewestPodcastEpisodes = new MutableLiveData<>();
 
         App.getSubsonicClientInstance(application, false)
                 .getPodcastClient()
@@ -60,7 +59,7 @@ public class PodcastRepository {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getNewestPodcasts() != null) {
-                            liveNewestPodcastEpisodes.setValue(MappingUtil.mapPodcastEpisode(response.body().getNewestPodcasts().getEpisodes()));
+                            liveNewestPodcastEpisodes.setValue(response.body().getNewestPodcasts().getEpisodes());
                         }
                     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/repository/QueueRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/QueueRepository.java
index f59a2c4d..5c3e5a49 100644
--- a/app/src/main/java/com/cappielloantonio/play/repository/QueueRepository.java
+++ b/app/src/main/java/com/cappielloantonio/play/repository/QueueRepository.java
@@ -1,20 +1,19 @@
 package com.cappielloantonio.play.repository;
 
 import android.app.Application;
-import android.util.Log;
 
 import androidx.lifecycle.LiveData;
 import androidx.media3.common.MediaItem;
 
 import com.cappielloantonio.play.database.AppDatabase;
 import com.cappielloantonio.play.database.dao.QueueDao;
-import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.model.Queue;
-import com.cappielloantonio.play.util.MappingUtil;
+import com.cappielloantonio.play.subsonic.models.Child;
 
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class QueueRepository {
     private static final String TAG = "QueueRepository";
@@ -30,8 +29,8 @@ public class QueueRepository {
         return queueDao.getAll();
     }
 
-    public List<Media> getMedia() {
-        List<Media> media = new ArrayList<>();
+    public List<Child> getMedia() {
+        List<Child> media = new ArrayList<>();
 
         GetMediaThreadSafe getMedia = new GetMediaThreadSafe(queueDao);
         Thread thread = new Thread(getMedia);
@@ -39,7 +38,10 @@ public class QueueRepository {
 
         try {
             thread.join();
-            media = getMedia.getMedia();
+            media = getMedia.getMedia().stream()
+                    .map(Child.class::cast)
+                    .collect(Collectors.toList());
+
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
@@ -47,9 +49,9 @@ public class QueueRepository {
         return media;
     }
 
-    public void insert(Media media, boolean reset, int afterIndex) {
+    public void insert(Child media, boolean reset, int afterIndex) {
         try {
-            List<Media> mediaList = new ArrayList<>();
+            List<Queue> mediaList = new ArrayList<>();
 
             if (!reset) {
                 GetMediaThreadSafe getMediaThreadSafe = new GetMediaThreadSafe(queueDao);
@@ -60,7 +62,7 @@ public class QueueRepository {
                 mediaList = getMediaThreadSafe.getMedia();
             }
 
-            mediaList.add(afterIndex, media);
+            mediaList.add(afterIndex, (Queue) media);
 
             Thread delete = new Thread(new DeleteAllThreadSafe(queueDao));
             delete.start();
@@ -74,9 +76,9 @@ public class QueueRepository {
         }
     }
 
-    public void insertAll(List<Media> toAdd, boolean reset, int afterIndex) {
+    public void insertAll(List<Child> toAdd, boolean reset, int afterIndex) {
         try {
-            List<Media> media = new ArrayList<>();
+            List<Queue> media = new ArrayList<>();
 
             if (!reset) {
                 GetMediaThreadSafe getMediaThreadSafe = new GetMediaThreadSafe(queueDao);
@@ -87,7 +89,9 @@ public class QueueRepository {
                 media = getMediaThreadSafe.getMedia();
             }
 
-            media.addAll(afterIndex, toAdd);
+            for (int i = 0; i < toAdd.size(); i++) {
+                media.add(afterIndex + i, (Queue) toAdd.get(i));
+            }
 
             Thread delete = new Thread(new DeleteAllThreadSafe(queueDao));
             delete.start();
@@ -206,7 +210,7 @@ public class QueueRepository {
 
     private static class GetMediaThreadSafe implements Runnable {
         private final QueueDao queueDao;
-        private List<Media> media;
+        private List<Queue> media;
 
         public GetMediaThreadSafe(QueueDao queueDao) {
             this.queueDao = queueDao;
@@ -214,26 +218,26 @@ public class QueueRepository {
 
         @Override
         public void run() {
-            media = MappingUtil.mapQueue(queueDao.getAllSimple());
+            media = queueDao.getAllSimple();
         }
 
-        public List<Media> getMedia() {
+        public List<Queue> getMedia() {
             return media;
         }
     }
 
     private static class InsertAllThreadSafe implements Runnable {
         private final QueueDao queueDao;
-        private final List<Media> media;
+        private final List<Queue> media;
 
-        public InsertAllThreadSafe(QueueDao queueDao, List<Media> media) {
+        public InsertAllThreadSafe(QueueDao queueDao, List<Queue> media) {
             this.queueDao = queueDao;
             this.media = media;
         }
 
         @Override
         public void run() {
-            queueDao.insertAll(MappingUtil.mapMediaToQueue(media));
+            queueDao.insertAll(media);
         }
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/repository/SearchingRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/SearchingRepository.java
index 94219558..d82101b4 100644
--- a/app/src/main/java/com/cappielloantonio/play/repository/SearchingRepository.java
+++ b/app/src/main/java/com/cappielloantonio/play/repository/SearchingRepository.java
@@ -8,15 +8,12 @@ import androidx.lifecycle.MutableLiveData;
 import com.cappielloantonio.play.App;
 import com.cappielloantonio.play.database.AppDatabase;
 import com.cappielloantonio.play.database.dao.RecentSearchDao;
-import com.cappielloantonio.play.model.Album;
-import com.cappielloantonio.play.model.Artist;
 import com.cappielloantonio.play.model.RecentSearch;
-import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.subsonic.models.AlbumID3;
 import com.cappielloantonio.play.subsonic.models.ArtistID3;
 import com.cappielloantonio.play.subsonic.models.Child;
+import com.cappielloantonio.play.subsonic.models.SearchResult3;
 import com.cappielloantonio.play.subsonic.models.SubsonicResponse;
-import com.cappielloantonio.play.util.MappingUtil;
 
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -37,8 +34,8 @@ public class SearchingRepository {
         recentSearchDao = database.recentSearchDao();
     }
 
-    public MutableLiveData<List<Media>> getSearchedSongs(String query) {
-        MutableLiveData<List<Media>> searchedSongs = new MutableLiveData<>();
+    public MutableLiveData<SearchResult3> search(String query) {
+        MutableLiveData<SearchResult3> result = new MutableLiveData<>();
 
         App.getSubsonicClientInstance(application, false)
                 .getSearchingClient()
@@ -46,13 +43,7 @@ public class SearchingRepository {
                 .enqueue(new Callback<SubsonicResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
-                        List<Media> songs = new ArrayList<>();
-
-                        if (response.isSuccessful() && response.body() != null && response.body().getSearchResult3() != null) {
-                            songs.addAll(MappingUtil.mapSong(response.body().getSearchResult3().getSongs()));
-                        }
-
-                        searchedSongs.setValue(songs);
+                        result.setValue(response.body().getSearchResult3());
                     }
 
                     @Override
@@ -61,61 +52,7 @@ public class SearchingRepository {
                     }
                 });
 
-        return searchedSongs;
-    }
-
-    public MutableLiveData<List<Album>> getSearchedAlbums(String query) {
-        MutableLiveData<List<Album>> searchedAlbums = new MutableLiveData<>();
-
-        App.getSubsonicClientInstance(application, false)
-                .getSearchingClient()
-                .search3(query, 0, 20, 0)
-                .enqueue(new Callback<SubsonicResponse>() {
-                    @Override
-                    public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
-                        List<Album> albums = new ArrayList<>();
-
-                        if (response.isSuccessful() && response.body() != null && response.body().getSearchResult3() != null) {
-                            albums.addAll(MappingUtil.mapAlbum(response.body().getSearchResult3().getAlbums()));
-                        }
-
-                        searchedAlbums.setValue(albums);
-                    }
-
-                    @Override
-                    public void onFailure(@NonNull Call<SubsonicResponse> call, @NonNull Throwable t) {
-
-                    }
-                });
-
-        return searchedAlbums;
-    }
-
-    public MutableLiveData<List<Artist>> getSearchedArtists(String query) {
-        MutableLiveData<List<Artist>> searchedArtists = new MutableLiveData<>();
-
-        App.getSubsonicClientInstance(application, false)
-                .getSearchingClient()
-                .search3(query, 0, 0, 20)
-                .enqueue(new Callback<SubsonicResponse>() {
-                    @Override
-                    public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
-                        List<Artist> artists = new ArrayList<>();
-
-                        if (response.isSuccessful() && response.body() != null && response.body().getSearchResult3() != null) {
-                            artists.addAll(MappingUtil.mapArtist(response.body().getSearchResult3().getArtists()));
-                        }
-
-                        searchedArtists.setValue(artists);
-                    }
-
-                    @Override
-                    public void onFailure(@NonNull Call<SubsonicResponse> call, @NonNull Throwable t) {
-
-                    }
-                });
-
-        return searchedArtists;
+        return result;
     }
 
     public MutableLiveData<List<String>> getSuggestions(String query) {
diff --git a/app/src/main/java/com/cappielloantonio/play/repository/SongRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/SongRepository.java
index 646adc33..dccfd577 100644
--- a/app/src/main/java/com/cappielloantonio/play/repository/SongRepository.java
+++ b/app/src/main/java/com/cappielloantonio/play/repository/SongRepository.java
@@ -6,10 +6,8 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
 
 import com.cappielloantonio.play.App;
-import com.cappielloantonio.play.interfaces.MediaCallback;
-import com.cappielloantonio.play.model.Media;
+import com.cappielloantonio.play.subsonic.models.Child;
 import com.cappielloantonio.play.subsonic.models.SubsonicResponse;
-import com.cappielloantonio.play.util.MappingUtil;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -29,8 +27,8 @@ public class SongRepository {
         this.application = application;
     }
 
-    public MutableLiveData<List<Media>> getStarredSongs(boolean random, int size) {
-        MutableLiveData<List<Media>> starredSongs = new MutableLiveData<>();
+    public MutableLiveData<List<Child>> getStarredSongs(boolean random, int size) {
+        MutableLiveData<List<Child>> starredSongs = new MutableLiveData<>();
 
         App.getSubsonicClientInstance(application, false)
                 .getAlbumSongListClient()
@@ -39,7 +37,7 @@ public class SongRepository {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getStarred2() != null) {
-                            List<Media> songs = new ArrayList<>(MappingUtil.mapSong(response.body().getStarred2().getSongs()));
+                            List<Child> songs = response.body().getStarred2().getSongs();
 
                             if (!random) {
                                 starredSongs.setValue(songs);
@@ -59,8 +57,8 @@ public class SongRepository {
         return starredSongs;
     }
 
-    public MutableLiveData<ArrayList<Media>> getInstantMix(Media song, int count) {
-        MutableLiveData<ArrayList<Media>> instantMix = new MutableLiveData<>();
+    public MutableLiveData<List<Child>> getInstantMix(Child song, int count) {
+        MutableLiveData<List<Child>> instantMix = new MutableLiveData<>();
 
         App.getSubsonicClientInstance(application, false)
                 .getBrowsingClient()
@@ -69,7 +67,7 @@ public class SongRepository {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getSimilarSongs2() != null) {
-                            instantMix.setValue(MappingUtil.mapSong(response.body().getSimilarSongs2().getSongs()));
+                            instantMix.setValue(response.body().getSimilarSongs2().getSongs());
                         }
                     }
 
@@ -82,8 +80,8 @@ public class SongRepository {
         return instantMix;
     }
 
-    public MutableLiveData<List<Media>> getRandomSample(int number, Integer fromYear, Integer toYear) {
-        MutableLiveData<List<Media>> randomSongsSample = new MutableLiveData<>();
+    public MutableLiveData<List<Child>> getRandomSample(int number, Integer fromYear, Integer toYear) {
+        MutableLiveData<List<Child>> randomSongsSample = new MutableLiveData<>();
 
         App.getSubsonicClientInstance(application, false)
                 .getAlbumSongListClient()
@@ -91,10 +89,10 @@ public class SongRepository {
                 .enqueue(new Callback<SubsonicResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
-                        List<Media> songs = new ArrayList<>();
+                        List<Child> songs = new ArrayList<>();
 
                         if (response.isSuccessful() && response.body() != null && response.body().getRandomSongs() != null) {
-                            songs.addAll(MappingUtil.mapSong(response.body().getRandomSongs().getSongs()));
+                            songs.addAll(response.body().getRandomSongs().getSongs());
                         }
 
                         randomSongsSample.setValue(songs);
@@ -177,8 +175,8 @@ public class SongRepository {
                 });
     }
 
-    public MutableLiveData<List<Media>> getSongsByGenre(String id) {
-        MutableLiveData<List<Media>> songsByGenre = new MutableLiveData<>();
+    public MutableLiveData<List<Child>> getSongsByGenre(String id) {
+        MutableLiveData<List<Child>> songsByGenre = new MutableLiveData<>();
 
         App.getSubsonicClientInstance(application, false)
                 .getAlbumSongListClient()
@@ -187,15 +185,15 @@ public class SongRepository {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getSongsByGenre() != null) {
-                            List<Media> newSongs = new ArrayList<>(MappingUtil.mapSong(response.body().getSongsByGenre().getSongs()));
-                            List<Media> songs = songsByGenre.getValue();
+                            List<Child> newSongs = response.body().getSongsByGenre().getSongs();
+                            List<Child> songs = songsByGenre.getValue();
 
                             if (songs == null) songs = new ArrayList<>();
                             songs.addAll(newSongs);
                             Collections.shuffle(songs);
 
-                            LinkedHashSet<Media> hashSet = new LinkedHashSet<>(songs);
-                            ArrayList<Media> songsWithoutDuplicates = new ArrayList<>(hashSet);
+                            LinkedHashSet<Child> hashSet = new LinkedHashSet<>(songs);
+                            ArrayList<Child> songsWithoutDuplicates = new ArrayList<>(hashSet);
 
                             songsByGenre.setValue(songsWithoutDuplicates);
                         }
@@ -210,8 +208,8 @@ public class SongRepository {
         return songsByGenre;
     }
 
-    public MutableLiveData<List<Media>> getSongsByGenres(ArrayList<String> genresId) {
-        MutableLiveData<List<Media>> songsByGenre = new MutableLiveData<>();
+    public MutableLiveData<List<Child>> getSongsByGenres(ArrayList<String> genresId) {
+        MutableLiveData<List<Child>> songsByGenre = new MutableLiveData<>();
 
         for (String id : genresId)
             App.getSubsonicClientInstance(application, false)
@@ -220,10 +218,10 @@ public class SongRepository {
                     .enqueue(new Callback<SubsonicResponse>() {
                         @Override
                         public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
-                            List<Media> songs = new ArrayList<>();
+                            List<Child> songs = new ArrayList<>();
 
                             if (response.isSuccessful() && response.body() != null && response.body().getSongsByGenre() != null) {
-                                songs.addAll(MappingUtil.mapSong(response.body().getSongsByGenre().getSongs()));
+                                songs.addAll(response.body().getSongsByGenre().getSongs());
                             }
 
                             songsByGenre.setValue(songs);
@@ -238,8 +236,8 @@ public class SongRepository {
         return songsByGenre;
     }
 
-    public MutableLiveData<Media> getSong(String id) {
-        MutableLiveData<Media> song = new MutableLiveData<>();
+    public MutableLiveData<Child> getSong(String id) {
+        MutableLiveData<Child> song = new MutableLiveData<>();
 
         App.getSubsonicClientInstance(application, false)
                 .getBrowsingClient()
@@ -248,7 +246,7 @@ public class SongRepository {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null) {
-                            song.setValue(MappingUtil.mapSong(response.body().getSong()));
+                            song.setValue(response.body().getSong());
                         }
                     }
 
@@ -261,12 +259,12 @@ public class SongRepository {
         return song;
     }
 
-    public MutableLiveData<String> getSongLyrics(Media song) {
+    public MutableLiveData<String> getSongLyrics(Child song) {
         MutableLiveData<String> lyrics = new MutableLiveData<>(null);
 
         App.getSubsonicClientInstance(application, false)
                 .getMediaRetrievalClient()
-                .getLyrics(song.getArtistName(), song.getTitle())
+                .getLyrics(song.getArtist(), song.getTitle())
                 .enqueue(new Callback<SubsonicResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
diff --git a/app/src/main/java/com/cappielloantonio/play/service/MediaManager.java b/app/src/main/java/com/cappielloantonio/play/service/MediaManager.java
index 8b55ae28..c7c0a9eb 100644
--- a/app/src/main/java/com/cappielloantonio/play/service/MediaManager.java
+++ b/app/src/main/java/com/cappielloantonio/play/service/MediaManager.java
@@ -1,17 +1,16 @@
 package com.cappielloantonio.play.service;
 
 import android.content.Context;
-import android.util.Log;
 
 import androidx.media3.common.MediaItem;
 import androidx.media3.session.MediaBrowser;
 
 import com.cappielloantonio.play.App;
 import com.cappielloantonio.play.interfaces.MediaIndexCallback;
-import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.repository.ChronologyRepository;
 import com.cappielloantonio.play.repository.QueueRepository;
 import com.cappielloantonio.play.repository.SongRepository;
+import com.cappielloantonio.play.subsonic.models.Child;
 import com.cappielloantonio.play.util.MappingUtil;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -64,7 +63,7 @@ public class MediaManager {
                 try {
                     if (mediaBrowserListenableFuture.isDone()) {
                         if (mediaBrowserListenableFuture.get().getMediaItemCount() < 1) {
-                            List<Media> media = getQueueRepository().getMedia();
+                            List<Child> media = getQueueRepository().getMedia();
                             if (media != null && media.size() >= 1) {
                                 init(mediaBrowserListenableFuture, context, media);
                             }
@@ -77,7 +76,7 @@ public class MediaManager {
         }
     }
 
-    public static void init(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, Context context, List<Media> media) {
+    public static void init(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, Context context, List<Child> media) {
         if (mediaBrowserListenableFuture != null) {
             mediaBrowserListenableFuture.addListener(() -> {
                 try {
@@ -164,7 +163,7 @@ public class MediaManager {
         }
     }
 
-    public static void startQueue(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, Context context, List<Media> media, int startIndex) {
+    public static void startQueue(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, Context context, List<Child> media, int startIndex) {
         if (mediaBrowserListenableFuture != null) {
             mediaBrowserListenableFuture.addListener(() -> {
                 try {
@@ -183,7 +182,7 @@ public class MediaManager {
         }
     }
 
-    public static void startQueue(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, Context context, Media media) {
+    public static void startQueue(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, Context context, Child media) {
         if (mediaBrowserListenableFuture != null) {
             mediaBrowserListenableFuture.addListener(() -> {
                 try {
@@ -201,7 +200,7 @@ public class MediaManager {
         }
     }
 
-    public static void enqueue(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, Context context, List<Media> media, boolean playImmediatelyAfter) {
+    public static void enqueue(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, Context context, List<Child> media, boolean playImmediatelyAfter) {
         if (mediaBrowserListenableFuture != null) {
             mediaBrowserListenableFuture.addListener(() -> {
                 try {
@@ -221,7 +220,7 @@ public class MediaManager {
         }
     }
 
-    public static void enqueue(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, Context context, Media media, boolean playImmediatelyAfter) {
+    public static void enqueue(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, Context context, Child media, boolean playImmediatelyAfter) {
         if (mediaBrowserListenableFuture != null) {
             mediaBrowserListenableFuture.addListener(() -> {
                 try {
@@ -241,7 +240,7 @@ public class MediaManager {
         }
     }
 
-    public static void swap(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, List<Media> media, int from, int to) {
+    public static void swap(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, List<Child> media, int from, int to) {
         if (mediaBrowserListenableFuture != null) {
             mediaBrowserListenableFuture.addListener(() -> {
                 try {
@@ -256,7 +255,7 @@ public class MediaManager {
         }
     }
 
-    public static void remove(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, List<Media> media, int toRemove) {
+    public static void remove(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture, List<Child> media, int toRemove) {
         if (mediaBrowserListenableFuture != null) {
             mediaBrowserListenableFuture.addListener(() -> {
                 try {
@@ -307,7 +306,7 @@ public class MediaManager {
     public static void saveChronology(MediaItem mediaItem) {
         if (mediaItem != null)
             if (getQueueRepository().isMediaPlayingPlausible(mediaItem))
-                getChronologyRepository().insert(MappingUtil.mapChronology(mediaItem));
+                getChronologyRepository().insert(mediaItem.mediaMetadata.extras.getParcelable("child"));
     }
 
     private static QueueRepository getQueueRepository() {
@@ -322,19 +321,19 @@ public class MediaManager {
         return new ChronologyRepository(App.getInstance());
     }
 
-    private static void enqueueDatabase(List<Media> media, boolean reset, int afterIndex) {
+    private static void enqueueDatabase(List<Child> media, boolean reset, int afterIndex) {
         getQueueRepository().insertAll(media, reset, afterIndex);
     }
 
-    private static void enqueueDatabase(Media media, boolean reset, int afterIndex) {
+    private static void enqueueDatabase(Child media, boolean reset, int afterIndex) {
         getQueueRepository().insert(media, reset, afterIndex);
     }
 
-    private static void swapDatabase(List<Media> media) {
+    private static void swapDatabase(List<Child> media) {
         getQueueRepository().insertAll(media, true, 0);
     }
 
-    private static void removeDatabase(List<Media> media, int toRemove) {
+    private static void removeDatabase(List<Child> media, int toRemove) {
         if (toRemove != -1) {
             media.remove(toRemove);
             getQueueRepository().insertAll(media, true, 0);
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/Subsonic.java b/app/src/main/java/com/cappielloantonio/play/subsonic/Subsonic.java
index 50f99d26..4785444b 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/Subsonic.java
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/Subsonic.java
@@ -115,13 +115,16 @@ public class Subsonic {
         Map<String, String> params = new HashMap<>();
         params.put("u", preferences.getUsername());
 
-        if (preferences.getAuthentication().getPassword() != null) params.put("p", preferences.getAuthentication().getPassword());
-        if (preferences.getAuthentication().getSalt() != null) params.put("s", preferences.getAuthentication().getSalt());
-        if (preferences.getAuthentication().getToken() != null) params.put("t", preferences.getAuthentication().getToken());
+        if (preferences.getAuthentication().getPassword() != null)
+            params.put("p", preferences.getAuthentication().getPassword());
+        if (preferences.getAuthentication().getSalt() != null)
+            params.put("s", preferences.getAuthentication().getSalt());
+        if (preferences.getAuthentication().getToken() != null)
+            params.put("t", preferences.getAuthentication().getToken());
 
         params.put("v", getApiVersion().getVersionString());
         params.put("c", preferences.getClientName());
-        params.put("f", "xml");
+        params.put("f", "json");
 
         return params;
     }
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumID3.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumID3.kt
index 0c671dd8..e5da2466 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumID3.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumID3.kt
@@ -1,131 +1,48 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Attribute;
-import com.tickaroo.tikxml.annotation.Xml;
-import com.tickaroo.tikxml.converters.date.rfc3339.DateRfc3339TypeConverter;
-
-import java.util.Date;
+import android.os.Parcelable
+import com.tickaroo.tikxml.annotation.Attribute
+import com.tickaroo.tikxml.annotation.Xml
+import com.tickaroo.tikxml.converters.date.rfc3339.DateRfc3339TypeConverter
+import kotlinx.android.parcel.Parcelize
+import java.util.*
 
+@Parcelize
 @Xml(name = "album")
-public class AlbumID3 {
+open class AlbumID3 : Parcelable {
     @Attribute
-    protected String id;
+    var id: String? = null
+
     @Attribute
-    protected String name;
+    var name: String? = null
+
     @Attribute
-    protected String artist;
+    var artist: String? = null
+
     @Attribute
-    protected String artistId;
+    var artistId: String? = null
+
     @Attribute(name = "coverArt")
-    protected String coverArtId;
+    var coverArtId: String? = null
+
     @Attribute
-    protected int songCount;
+    var songCount = 0
+
     @Attribute
-    protected int duration;
+    var duration = 0
+
     @Attribute
-    protected Long playCount;
-    @Attribute(converter = DateRfc3339TypeConverter.class)
-    protected Date created;
-    @Attribute(converter = DateRfc3339TypeConverter.class)
-    protected Date starred;
+    var playCount: Long? = null
+
+    @Attribute(converter = DateRfc3339TypeConverter::class)
+    var created: Date? = null
+
+    @Attribute(converter = DateRfc3339TypeConverter::class)
+    var starred: Date? = null
+
     @Attribute
-    protected Integer year;
+    var year: Int? = null
+
     @Attribute
-    protected String genre;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    public String getArtist() {
-        return artist;
-    }
-
-    public void setArtist(String value) {
-        this.artist = value;
-    }
-
-    public String getArtistId() {
-        return artistId;
-    }
-
-    public void setArtistId(String value) {
-        this.artistId = value;
-    }
-
-    public String getCoverArtId() {
-        return coverArtId;
-    }
-
-    public void setCoverArtId(String value) {
-        this.coverArtId = value;
-    }
-
-    public int getSongCount() {
-        return songCount;
-    }
-
-    public void setSongCount(int value) {
-        this.songCount = value;
-    }
-
-    public int getDuration() {
-        return duration;
-    }
-
-    public void setDuration(int value) {
-        this.duration = value;
-    }
-
-    public Long getPlayCount() {
-        return playCount;
-    }
-
-    public void setPlayCount(Long value) {
-        this.playCount = value;
-    }
-
-    public Date getCreated() {
-        return created;
-    }
-
-    public void setCreated(Date value) {
-        this.created = value;
-    }
-
-    public Date getStarred() {
-        return starred;
-    }
-
-    public void setStarred(Date value) {
-        this.starred = value;
-    }
-
-    public Integer getYear() {
-        return year;
-    }
-
-    public void setYear(Integer value) {
-        this.year = value;
-    }
-
-    public String getGenre() {
-        return genre;
-    }
-
-    public void setGenre(String value) {
-        this.genre = value;
-    }
-}
+    var genre: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumInfo.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumInfo.kt
index 21defd67..df2de5e7 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumInfo.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumInfo.kt
@@ -1,68 +1,25 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Attribute;
-import com.tickaroo.tikxml.annotation.Xml;
+import com.tickaroo.tikxml.annotation.Attribute
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class AlbumInfo {
+class AlbumInfo {
     @Attribute
-    protected String notes;
-    @Attribute
-    protected String musicBrainzId;
-    @Attribute
-    protected String lastFmUrl;
-    @Attribute
-    protected String smallImageUrl;
-    @Attribute
-    protected String mediumImageUrl;
-    @Attribute
-    protected String largeImageUrl;
-    
-    public String getNotes() {
-        return notes;
-    }
-    
-    public void setNotes(String value) {
-        this.notes = value;
-    }
-    
-    public String getMusicBrainzId() {
-        return musicBrainzId;
-    }
+    var notes: String? = null
 
-    public void setMusicBrainzId(String value) {
-        this.musicBrainzId = value;
-    }
-    
-    public String getLastFmUrl() {
-        return lastFmUrl;
-    }
-    
-    public void setLastFmUrl(String value) {
-        this.lastFmUrl = value;
-    }
+    @Attribute
+    var musicBrainzId: String? = null
 
-    public String getSmallImageUrl() {
-        return smallImageUrl;
-    }
-    
-    public void setSmallImageUrl(String value) {
-        this.smallImageUrl = value;
-    }
-    
-    public String getMediumImageUrl() {
-        return mediumImageUrl;
-    }
-    
-    public void setMediumImageUrl(String value) {
-        this.mediumImageUrl = value;
-    }
-    
-    public String getLargeImageUrl() {
-        return largeImageUrl;
-    }
-    
-    public void setLargeImageUrl(String value) {
-        this.largeImageUrl = value;
-    }
-}
+    @Attribute
+    var lastFmUrl: String? = null
+
+    @Attribute
+    var smallImageUrl: String? = null
+
+    @Attribute
+    var mediumImageUrl: String? = null
+
+    @Attribute
+    var largeImageUrl: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumList.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumList.kt
index 64066da0..84a4f016 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumList.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumList.kt
@@ -1,35 +1,5 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class AlbumList {
-    protected List<Child> albums;
-
-    /**
-     * Gets the value of the albums property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the albums property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAlbums().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Child }
-     */
-    public List<Child> getAlbums() {
-        if (albums == null) {
-            albums = new ArrayList<>();
-        }
-        return this.albums;
-    }
-}
+class AlbumList {
+    var albums: List<Child>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumList2.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumList2.kt
index 12797881..ac1c8e7a 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumList2.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumList2.kt
@@ -1,24 +1,10 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
-
-import java.util.ArrayList;
-import java.util.List;
+import com.tickaroo.tikxml.annotation.Element
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class AlbumList2 {
+class AlbumList2 {
     @Element
-    protected List<AlbumID3> albums;
-
-    public List<AlbumID3> getAlbums() {
-        if (albums == null) {
-            albums = new ArrayList<>();
-        }
-        return this.albums;
-    }
-
-    public void setAlbums(List<AlbumID3> albums) {
-        this.albums = albums;
-    }
-}
+    var albums: List<AlbumID3>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumWithSongsID3.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumWithSongsID3.kt
index 8a679c8a..90b4d66d 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumWithSongsID3.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/AlbumWithSongsID3.kt
@@ -1,24 +1,13 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
-
-import java.util.ArrayList;
-import java.util.List;
+import android.os.Parcelable
+import com.tickaroo.tikxml.annotation.Element
+import com.tickaroo.tikxml.annotation.Xml
+import kotlinx.android.parcel.Parcelize
 
+@Parcelize
 @Xml
-public class AlbumWithSongsID3 extends AlbumID3 {
+class AlbumWithSongsID3 : AlbumID3(), Parcelable {
     @Element(name = "song")
-    protected List<Child> songs;
-
-    public List<Child> getSongs() {
-        if (songs == null) {
-            songs = new ArrayList<>();
-        }
-        return this.songs;
-    }
-
-    public void setSongs(List<Child> songs) {
-        this.songs = songs;
-    }
-}
+    var songs: List<Child>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Artist.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Artist.kt
index e51cc54c..62624833 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Artist.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Artist.kt
@@ -1,112 +1,71 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.time.LocalDateTime;
-
-public class Artist {
-    protected String id;
-    protected String name;
-    protected LocalDateTime starred;
-    protected Integer userRating;
-    protected Double averageRating;
+import java.time.LocalDateTime
 
+class Artist {
     /**
      * Gets the value of the id property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public String getId() {
-        return id;
-    }
-
     /**
      * Sets the value of the id property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setId(String value) {
-        this.id = value;
-    }
-
+    var id: String? = null
     /**
      * Gets the value of the name property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public String getName() {
-        return name;
-    }
-
     /**
      * Sets the value of the name property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setName(String value) {
-        this.name = value;
-    }
-
+    var name: String? = null
     /**
      * Gets the value of the starred property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public LocalDateTime getStarred() {
-        return starred;
-    }
-
     /**
      * Sets the value of the starred property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setStarred(LocalDateTime value) {
-        this.starred = value;
-    }
-
+    var starred: LocalDateTime? = null
     /**
      * Gets the value of the userRating property.
      *
      * @return possible object is
-     * {@link Integer }
+     * [Integer]
      */
-    public Integer getUserRating() {
-        return userRating;
-    }
-
     /**
      * Sets the value of the userRating property.
      *
      * @param value allowed object is
-     *              {@link Integer }
+     * [Integer]
      */
-    public void setUserRating(Integer value) {
-        this.userRating = value;
-    }
-
+    var userRating: Int? = null
     /**
      * Gets the value of the averageRating property.
      *
      * @return possible object is
-     * {@link Double }
+     * [Double]
      */
-    public Double getAverageRating() {
-        return averageRating;
-    }
-
     /**
      * Sets the value of the averageRating property.
      *
      * @param value allowed object is
-     *              {@link Double }
+     * [Double]
      */
-    public void setAverageRating(Double value) {
-        this.averageRating = value;
-    }
-
-}
+    var averageRating: Double? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistID3.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistID3.kt
index 17ccdb43..12332998 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistID3.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistID3.kt
@@ -1,62 +1,27 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Attribute;
-import com.tickaroo.tikxml.annotation.Xml;
-import com.tickaroo.tikxml.converters.date.rfc3339.DateRfc3339TypeConverter;
-
-import java.util.Date;
+import android.os.Parcelable
+import com.tickaroo.tikxml.annotation.Attribute
+import com.tickaroo.tikxml.annotation.Xml
+import com.tickaroo.tikxml.converters.date.rfc3339.DateRfc3339TypeConverter
+import kotlinx.android.parcel.Parcelize
+import java.util.*
 
+@Parcelize
 @Xml(name = "artist")
-public class ArtistID3 {
+open class ArtistID3 : Parcelable {
     @Attribute
-    protected String id;
+    var id: String? = null
+
     @Attribute
-    protected String name;
+    var name: String? = null
+
     @Attribute(name = "coverArt")
-    protected String coverArtId;
+    var coverArtId: String? = null
+
     @Attribute
-    protected int albumCount;
-    @Attribute(converter = DateRfc3339TypeConverter.class)
-    protected Date starred;
+    var albumCount = 0
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    public String getCoverArtId() {
-        return coverArtId;
-    }
-
-    public void setCoverArtId(String value) {
-        this.coverArtId = value;
-    }
-
-    public int getAlbumCount() {
-        return albumCount;
-    }
-
-    public void setAlbumCount(int value) {
-        this.albumCount = value;
-    }
-
-    public Date getStarred() {
-        return starred;
-    }
-
-    public void setStarred(Date value) {
-        this.starred = value;
-    }
-
-}
+    @Attribute(converter = DateRfc3339TypeConverter::class)
+    var starred: Date? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistInfo.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistInfo.kt
index b16fc665..8937e64d 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistInfo.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistInfo.kt
@@ -1,36 +1,5 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class ArtistInfo extends ArtistInfoBase {
-    protected List<Artist> similarArtists;
-
-    /**
-     * Gets the value of the similarArtists property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the similarArtists property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSimilarArtists().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Artist }
-     */
-    public List<Artist> getSimilarArtists() {
-        if (similarArtists == null) {
-            similarArtists = new ArrayList<>();
-        }
-        return this.similarArtists;
-    }
-
-}
+class ArtistInfo : ArtistInfoBase() {
+    var similarArtists: List<Artist>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistInfo2.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistInfo2.kt
index bf423ceb..19d427ef 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistInfo2.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistInfo2.kt
@@ -1,24 +1,10 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
-
-import java.util.ArrayList;
-import java.util.List;
+import com.tickaroo.tikxml.annotation.Element
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class ArtistInfo2 extends ArtistInfoBase {
+class ArtistInfo2 : ArtistInfoBase() {
     @Element(name = "similarArtist")
-    protected List<SimilarArtistID3> similarArtists;
-
-    public List<SimilarArtistID3> getSimilarArtists() {
-        if (similarArtists == null) {
-            similarArtists = new ArrayList<>();
-        }
-        return this.similarArtists;
-    }
-
-    public void setSimilarArtists(List<SimilarArtistID3> similarArtists) {
-        this.similarArtists = similarArtists;
-    }
-}
+    var similarArtists: List<SimilarArtistID3>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistInfoBase.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistInfoBase.kt
index af98f030..e4530d8f 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistInfoBase.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistInfoBase.kt
@@ -1,68 +1,25 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.PropertyElement;
-import com.tickaroo.tikxml.annotation.Xml;
+import com.tickaroo.tikxml.annotation.PropertyElement
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class ArtistInfoBase {
+open class ArtistInfoBase {
     @PropertyElement
-    protected String biography;
+    var biography: String? = null
+
     @PropertyElement
-    protected String musicBrainzId;
+    var musicBrainzId: String? = null
+
     @PropertyElement
-    protected String lastFmUrl;
+    var lastFmUrl: String? = null
+
     @PropertyElement
-    protected String smallImageUrl;
+    var smallImageUrl: String? = null
+
     @PropertyElement
-    protected String mediumImageUrl;
+    var mediumImageUrl: String? = null
+
     @PropertyElement
-    protected String largeImageUrl;
-
-    public String getBiography() {
-        return biography;
-    }
-
-    public void setBiography(String value) {
-        this.biography = value;
-    }
-
-    public String getMusicBrainzId() {
-        return musicBrainzId;
-    }
-
-    public void setMusicBrainzId(String value) {
-        this.musicBrainzId = value;
-    }
-
-    public String getLastFmUrl() {
-        return lastFmUrl;
-    }
-
-    public void setLastFmUrl(String value) {
-        this.lastFmUrl = value;
-    }
-
-    public String getSmallImageUrl() {
-        return smallImageUrl;
-    }
-
-    public void setSmallImageUrl(String value) {
-        this.smallImageUrl = value;
-    }
-
-    public String getMediumImageUrl() {
-        return mediumImageUrl;
-    }
-
-    public void setMediumImageUrl(String value) {
-        this.mediumImageUrl = value;
-    }
-
-    public String getLargeImageUrl() {
-        return largeImageUrl;
-    }
-
-    public void setLargeImageUrl(String value) {
-        this.largeImageUrl = value;
-    }
-}
+    var largeImageUrl: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistWithAlbumsID3.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistWithAlbumsID3.kt
index 7ee8a6f8..194f8d32 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistWithAlbumsID3.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistWithAlbumsID3.kt
@@ -1,24 +1,13 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
-
-import java.util.ArrayList;
-import java.util.List;
+import android.os.Parcelable
+import com.tickaroo.tikxml.annotation.Element
+import com.tickaroo.tikxml.annotation.Xml
+import kotlinx.android.parcel.Parcelize
 
+@Parcelize
 @Xml
-public class ArtistWithAlbumsID3 extends ArtistID3 {
+class ArtistWithAlbumsID3 : ArtistID3(), Parcelable {
     @Element(name = "album")
-    protected List<AlbumID3> albums;
-
-    public List<AlbumID3> getAlbums() {
-        if (albums == null) {
-            albums = new ArrayList<>();
-        }
-        return this.albums;
-    }
-
-    public void setAlbums(List<AlbumID3> albums) {
-        this.albums = albums;
-    }
-}
+    var albums: List<AlbumID3>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistsID3.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistsID3.kt
index 7a1530b0..17adee76 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistsID3.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ArtistsID3.kt
@@ -1,33 +1,11 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
-
-import java.util.ArrayList;
-import java.util.List;
+import com.tickaroo.tikxml.annotation.Element
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class ArtistsID3 {
+class ArtistsID3 {
     @Element(name = "index")
-    protected List<IndexID3> indices;
-    protected String ignoredArticles;
-
-    public List<IndexID3> getIndices() {
-        if (indices == null) {
-            indices = new ArrayList<>();
-        }
-        return this.indices;
-    }
-
-    public void setIndices(List<IndexID3> indices) {
-        this.indices = indices;
-    }
-
-    public String getIgnoredArticles() {
-        return ignoredArticles;
-    }
-
-    public void setIgnoredArticles(String value) {
-        this.ignoredArticles = value;
-    }
-}
+    var indices: List<IndexID3>? = null
+    var ignoredArticles: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/AudioTrack.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/AudioTrack.kt
index 740d66ec..00ae0e90 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/AudioTrack.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/AudioTrack.kt
@@ -1,67 +1,43 @@
-package com.cappielloantonio.play.subsonic.models;
-
-public class AudioTrack {
-    protected String id;
-    protected String name;
-    protected String languageCode;
+package com.cappielloantonio.play.subsonic.models
 
+class AudioTrack {
     /**
      * Gets the value of the id property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public String getId() {
-        return id;
-    }
-
     /**
      * Sets the value of the id property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setId(String value) {
-        this.id = value;
-    }
-
+    var id: String? = null
     /**
      * Gets the value of the name property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public String getName() {
-        return name;
-    }
-
     /**
      * Sets the value of the name property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setName(String value) {
-        this.name = value;
-    }
-
+    var name: String? = null
     /**
      * Gets the value of the languageCode property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public String getLanguageCode() {
-        return languageCode;
-    }
-
     /**
      * Sets the value of the languageCode property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setLanguageCode(String value) {
-        this.languageCode = value;
-    }
-}
+    var languageCode: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Bookmark.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Bookmark.kt
index 6eee6d43..5f0fbabe 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Bookmark.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Bookmark.kt
@@ -1,126 +1,78 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.time.LocalDateTime;
-
-public class Bookmark {
-    protected Child entry;
-    protected long position;
-    protected String username;
-    protected String comment;
-    protected LocalDateTime created;
-    protected LocalDateTime changed;
+import java.time.LocalDateTime
 
+class Bookmark {
     /**
      * Gets the value of the entry property.
      *
      * @return possible object is
-     * {@link Child }
+     * [Child]
      */
-    public Child getEntry() {
-        return entry;
-    }
-
     /**
      * Sets the value of the entry property.
      *
      * @param value allowed object is
-     *              {@link Child }
+     * [Child]
      */
-    public void setEntry(Child value) {
-        this.entry = value;
-    }
-
+    var entry: Child? = null
     /**
      * Gets the value of the position property.
      */
-    public long getPosition() {
-        return position;
-    }
-
     /**
      * Sets the value of the position property.
      */
-    public void setPosition(long value) {
-        this.position = value;
-    }
-
+    var position: Long = 0
     /**
      * Gets the value of the username property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public String getUsername() {
-        return username;
-    }
-
     /**
      * Sets the value of the username property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setUsername(String value) {
-        this.username = value;
-    }
-
+    var username: String? = null
     /**
      * Gets the value of the comment property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public String getComment() {
-        return comment;
-    }
-
     /**
      * Sets the value of the comment property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setComment(String value) {
-        this.comment = value;
-    }
-
+    var comment: String? = null
     /**
      * Gets the value of the created property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public LocalDateTime getCreated() {
-        return created;
-    }
-
     /**
      * Sets the value of the created property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setCreated(LocalDateTime value) {
-        this.created = value;
-    }
-
+    var created: LocalDateTime? = null
     /**
      * Gets the value of the changed property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public LocalDateTime getChanged() {
-        return changed;
-    }
-
     /**
      * Sets the value of the changed property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setChanged(LocalDateTime value) {
-        this.changed = value;
-    }
-}
+    var changed: LocalDateTime? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Bookmarks.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Bookmarks.kt
index a2015d90..afc43810 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Bookmarks.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Bookmarks.kt
@@ -1,36 +1,5 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class Bookmarks {
-    protected List<Bookmark> bookmarks;
-
-    /**
-     * Gets the value of the bookmarks property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the bookmarks property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getBookmarks().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Bookmark }
-     */
-    public List<Bookmark> getBookmarks() {
-        if (bookmarks == null) {
-            bookmarks = new ArrayList<>();
-        }
-        return this.bookmarks;
-    }
-
-}
+class Bookmarks {
+    var bookmarks: List<Bookmark>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Captions.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Captions.kt
index 2754cd90..a229f940 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Captions.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Captions.kt
@@ -1,46 +1,30 @@
-package com.cappielloantonio.play.subsonic.models;
-
-public class Captions {
-    protected String id;
-    protected String name;
+package com.cappielloantonio.play.subsonic.models
 
+class Captions {
     /**
      * Gets the value of the id property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public String getId() {
-        return id;
-    }
-
     /**
      * Sets the value of the id property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setId(String value) {
-        this.id = value;
-    }
-
+    var id: String? = null
     /**
      * Gets the value of the name property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public String getName() {
-        return name;
-    }
-
     /**
      * Sets the value of the name property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setName(String value) {
-        this.name = value;
-    }
-}
+    var name: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ChatMessage.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ChatMessage.kt
index e8bb7266..f3e6211e 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ChatMessage.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ChatMessage.kt
@@ -1,61 +1,37 @@
-package com.cappielloantonio.play.subsonic.models;
-
-public class ChatMessage {
-    protected String username;
-    protected long time;
-    protected String message;
+package com.cappielloantonio.play.subsonic.models
 
+class ChatMessage {
     /**
      * Gets the value of the username property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public String getUsername() {
-        return username;
-    }
-
     /**
      * Sets the value of the username property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setUsername(String value) {
-        this.username = value;
-    }
-
+    var username: String? = null
     /**
      * Gets the value of the time property.
      */
-    public long getTime() {
-        return time;
-    }
-
     /**
      * Sets the value of the time property.
      */
-    public void setTime(long value) {
-        this.time = value;
-    }
-
+    var time: Long = 0
     /**
      * Gets the value of the message property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public String getMessage() {
-        return message;
-    }
-
     /**
      * Sets the value of the message property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setMessage(String value) {
-        this.message = value;
-    }
-}
+    var message: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ChatMessages.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ChatMessages.kt
index e962695d..75162019 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ChatMessages.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ChatMessages.kt
@@ -1,35 +1,5 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class ChatMessages {
-    protected List<ChatMessage> chatMessages;
-
-    /**
-     * Gets the value of the chatMessages property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the chatMessages property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getChatMessages().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ChatMessage }
-     */
-    public List<ChatMessage> getChatMessages() {
-        if (chatMessages == null) {
-            chatMessages = new ArrayList<>();
-        }
-        return this.chatMessages;
-    }
-}
+class ChatMessages {
+    var chatMessages: List<ChatMessage>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Child.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Child.kt
index 9621bfef..fb0285e7 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Child.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Child.kt
@@ -1,322 +1,139 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Attribute;
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
-import com.tickaroo.tikxml.converters.date.rfc3339.DateRfc3339TypeConverter;
-
-import java.util.Date;
+import android.os.Parcelable
+import androidx.room.ColumnInfo
+import androidx.room.PrimaryKey
+import com.tickaroo.tikxml.annotation.Attribute
+import com.tickaroo.tikxml.annotation.Xml
+import com.tickaroo.tikxml.converters.date.rfc3339.DateRfc3339TypeConverter
+import kotlinx.android.parcel.Parcelize
+import java.util.*
 
+@Parcelize
 @Xml
-public class Child {
+open class Child(
+    @PrimaryKey
+    @ColumnInfo(name = "id")
     @Attribute
-    protected String id;
+    open val id: String,
+
+    @ColumnInfo(name = "parent_id")
     @Attribute(name = "parent")
-    protected String parentId;
-    @Attribute(name = "isDir")
-    protected boolean dir;
+    var parentId: String? = null,
+
+    @ColumnInfo(name = "is_dir")
     @Attribute
-    protected String title;
+    var isDir: Boolean = false,
+
+    @ColumnInfo
     @Attribute
-    protected String album;
+    var title: String? = null,
+
+    @ColumnInfo
     @Attribute
-    protected String artist;
+    var album: String? = null,
+
+    @ColumnInfo
     @Attribute
-    protected Integer track;
+    var artist: String? = null,
+
+    @ColumnInfo
     @Attribute
-    protected Integer year;
+    var track: Int? = null,
+
+    @ColumnInfo
+    @Attribute
+    var year: Int? = null,
+
+    @ColumnInfo
     @Attribute(name = "genre")
-    protected String genre;
+    var genre: String? = null,
+
+    @ColumnInfo(name = "cover_art_id")
     @Attribute(name = "coverArt")
-    protected String coverArtId;
+    var coverArtId: String? = null,
+
+    @ColumnInfo
     @Attribute
-    protected Long size;
+    var size: Long? = null,
+
+    @ColumnInfo(name = "content_type")
     @Attribute
-    protected String contentType;
+    var contentType: String? = null,
+
+    @ColumnInfo
     @Attribute
-    protected String suffix;
+    var suffix: String? = null,
+
+    @ColumnInfo("transcoding_content_type")
     @Attribute
-    protected String transcodedContentType;
+    var transcodedContentType: String? = null,
+
+    @ColumnInfo(name = "transcoded_suffix")
     @Attribute
-    protected String transcodedSuffix;
+    var transcodedSuffix: String? = null,
+
+    @ColumnInfo
     @Attribute
-    protected Integer duration;
+    var duration: Int? = null,
+
+    @ColumnInfo("bitrate")
+    @Attribute(name = "bitRate")
+    var bitrate: Int? = null,
+
+    @ColumnInfo
     @Attribute
-    protected Integer bitRate;
-    @Attribute
-    protected String path;
+    var path: String? = null,
+
+    @ColumnInfo(name = "is_video")
     @Attribute(name = "isVideo")
-    protected Boolean video;
+    var isVideo: Boolean = false,
+
+    @ColumnInfo(name = "user_rating")
     @Attribute
-    protected Integer userRating;
+    var userRating: Int? = null,
+
+    @ColumnInfo(name = "average_rating")
     @Attribute
-    protected Double averageRating;
+    var averageRating: Double? = null,
+
+    @ColumnInfo(name = "play_count")
     @Attribute
-    protected Long playCount;
+    var playCount: Long? = null,
+
+    @ColumnInfo(name = "disc_number")
     @Attribute
-    protected Integer discNumber;
-    @Attribute(converter = DateRfc3339TypeConverter.class)
-    protected Date created;
-    @Attribute(converter = DateRfc3339TypeConverter.class)
-    protected Date starred;
+    var discNumber: Int? = null,
+
+    @ColumnInfo
+    @Attribute(converter = DateRfc3339TypeConverter::class)
+    var created: Date? = null,
+
+    @ColumnInfo
+    @Attribute(converter = DateRfc3339TypeConverter::class)
+    var starred: Date? = null,
+
+    @ColumnInfo(name = "album_id")
     @Attribute
-    protected String albumId;
+    var albumId: String? = null,
+
+    @ColumnInfo(name = "artist_id")
     @Attribute
-    protected String artistId;
+    var artistId: String? = null,
+
+    @ColumnInfo
     @Attribute
-    protected String type;
+    var type: String? = null,
+
+    @ColumnInfo(name = "bookmark_position")
     @Attribute
-    protected Long bookmarkPosition;
+    var bookmarkPosition: Long? = null,
+
+    @ColumnInfo(name = "original_width")
     @Attribute
-    protected Integer originalWidth;
+    var originalWidth: Int? = null,
+
+    @ColumnInfo(name = "original_height")
     @Attribute
-    protected Integer originalHeight;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public String getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(String value) {
-        this.parentId = value;
-    }
-
-    public boolean isDir() {
-        return dir;
-    }
-
-    public void setDir(boolean value) {
-        this.dir = value;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String value) {
-        this.title = value;
-    }
-
-    public String getAlbum() {
-        return album;
-    }
-
-    public void setAlbum(String value) {
-        this.album = value;
-    }
-
-    public String getArtist() {
-        return artist;
-    }
-
-    public void setArtist(String value) {
-        this.artist = value;
-    }
-
-    public Integer getTrack() {
-        return track;
-    }
-
-    public void setTrack(Integer value) {
-        this.track = value;
-    }
-
-    public Integer getYear() {
-        return year;
-    }
-
-    public void setYear(Integer value) {
-        this.year = value;
-    }
-
-    public String getGenre() {
-        return genre;
-    }
-
-    public void setGenre(String value) {
-        this.genre = value;
-    }
-
-    public String getCoverArtId() {
-        return coverArtId;
-    }
-
-    public void setCoverArtId(String value) {
-        this.coverArtId = value;
-    }
-
-    public Long getSize() {
-        return size;
-    }
-
-    public void setSize(Long value) {
-        this.size = value;
-    }
-
-    public String getContentType() {
-        return contentType;
-    }
-
-    public void setContentType(String value) {
-        this.contentType = value;
-    }
-
-    public String getSuffix() {
-        return suffix;
-    }
-
-    public void setSuffix(String value) {
-        this.suffix = value;
-    }
-
-    public String getTranscodedContentType() {
-        return transcodedContentType;
-    }
-
-    public void setTranscodedContentType(String value) {
-        this.transcodedContentType = value;
-    }
-
-    public String getTranscodedSuffix() {
-        return transcodedSuffix;
-    }
-
-    public void setTranscodedSuffix(String value) {
-        this.transcodedSuffix = value;
-    }
-
-    public Integer getDuration() {
-        return duration;
-    }
-
-    public void setDuration(Integer value) {
-        this.duration = value;
-    }
-
-    public Integer getBitRate() {
-        return bitRate;
-    }
-
-    public void setBitRate(Integer value) {
-        this.bitRate = value;
-    }
-
-    public String getPath() {
-        return path;
-    }
-
-    public void setPath(String value) {
-        this.path = value;
-    }
-
-    public Boolean isVideo() {
-        return video;
-    }
-
-    public void setVideo(Boolean value) {
-        this.video = value;
-    }
-
-    public Integer getUserRating() {
-        return userRating;
-    }
-
-    public void setUserRating(Integer value) {
-        this.userRating = value;
-    }
-
-    public Double getAverageRating() {
-        return averageRating;
-    }
-
-    public void setAverageRating(Double value) {
-        this.averageRating = value;
-    }
-
-    public Long getPlayCount() {
-        return playCount;
-    }
-
-    public void setPlayCount(Long value) {
-        this.playCount = value;
-    }
-
-    public Integer getDiscNumber() {
-        return discNumber;
-    }
-
-    public void setDiscNumber(Integer value) {
-        this.discNumber = value;
-    }
-
-    public Date getCreated() {
-        return created;
-    }
-
-    public void setCreated(Date value) {
-        this.created = value;
-    }
-
-    public Date getStarred() {
-        return starred;
-    }
-
-    public void setStarred(Date value) {
-        this.starred = value;
-    }
-
-    public String getAlbumId() {
-        return albumId;
-    }
-
-    public void setAlbumId(String value) {
-        this.albumId = value;
-    }
-
-    public String getArtistId() {
-        return artistId;
-    }
-
-    public void setArtistId(String value) {
-        this.artistId = value;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String value) {
-        this.type = value;
-    }
-
-    public Long getBookmarkPosition() {
-        return bookmarkPosition;
-    }
-
-    public void setBookmarkPosition(Long value) {
-        this.bookmarkPosition = value;
-    }
-
-    public Integer getOriginalWidth() {
-        return originalWidth;
-    }
-
-    public void setOriginalWidth(Integer value) {
-        this.originalWidth = value;
-    }
-
-    public Integer getOriginalHeight() {
-        return originalHeight;
-    }
-
-    public void setOriginalHeight(Integer value) {
-        this.originalHeight = value;
-    }
-}
+    var originalHeight: Int? = null
+) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Directory.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Directory.kt
index 8b751702..1a5ed477 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Directory.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Directory.kt
@@ -1,183 +1,128 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
+import java.time.LocalDateTime
 
-public class Directory {
-    protected List<Child> children;
-    protected String id;
-    protected String parentId;
-    protected String name;
-    protected LocalDateTime starred;
-    protected Integer userRating;
-    protected Double averageRating;
-    protected Long playCount;
+class Directory {
+    protected var children: List<Child>? = null
+    /**
+     * Gets the value of the id property.
+     *
+     * @return possible object is
+     * [String]
+     */
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value allowed object is
+     * [String]
+     */
+    var id: String? = null
+    /**
+     * Gets the value of the parentId property.
+     *
+     * @return possible object is
+     * [String]
+     */
+    /**
+     * Sets the value of the parentId property.
+     *
+     * @param value allowed object is
+     * [String]
+     */
+    var parentId: String? = null
+    /**
+     * Gets the value of the name property.
+     *
+     * @return possible object is
+     * [String]
+     */
+    /**
+     * Sets the value of the name property.
+     *
+     * @param value allowed object is
+     * [String]
+     */
+    var name: String? = null
+    /**
+     * Gets the value of the starred property.
+     *
+     * @return possible object is
+     * [String]
+     */
+    /**
+     * Sets the value of the starred property.
+     *
+     * @param value allowed object is
+     * [String]
+     */
+    var starred: LocalDateTime? = null
+    /**
+     * Gets the value of the userRating property.
+     *
+     * @return possible object is
+     * [Integer]
+     */
+    /**
+     * Sets the value of the userRating property.
+     *
+     * @param value allowed object is
+     * [Integer]
+     */
+    var userRating: Int? = null
+    /**
+     * Gets the value of the averageRating property.
+     *
+     * @return possible object is
+     * [Double]
+     */
+    /**
+     * Sets the value of the averageRating property.
+     *
+     * @param value allowed object is
+     * [Double]
+     */
+    var averageRating: Double? = null
+    /**
+     * Gets the value of the playCount property.
+     *
+     * @return possible object is
+     * [Long]
+     */
+    /**
+     * Sets the value of the playCount property.
+     *
+     * @param value allowed object is
+     * [Long]
+     */
+    var playCount: Long? = null
 
     /**
      * Gets the value of the children property.
      *
-     * <p>
+     *
+     *
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
      * This is why there is not a <CODE>set</CODE> method for the children property.
      *
-     * <p>
+     *
+     *
      * For example, to add a new item, do as follows:
      * <pre>
-     *    getchildren().add(newItem);
-     * </pre>
+     * getchildren().add(newItem);
+    </pre> *
+     *
+     *
      *
      *
-     * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Child }
+     * [Child]
      */
-    public List<Child> getchildren() {
+    fun getchildren(): List<Child>? {
         if (children == null) {
-            children = new ArrayList<>();
+            children = ArrayList()
         }
-        return this.children;
+        return children
     }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the parentId property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getParentId() {
-        return parentId;
-    }
-
-    /**
-     * Sets the value of the parentId property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setParentId(String value) {
-        this.parentId = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the starred property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public LocalDateTime getStarred() {
-        return starred;
-    }
-
-    /**
-     * Sets the value of the starred property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setStarred(LocalDateTime value) {
-        this.starred = value;
-    }
-
-    /**
-     * Gets the value of the userRating property.
-     *
-     * @return possible object is
-     * {@link Integer }
-     */
-    public Integer getUserRating() {
-        return userRating;
-    }
-
-    /**
-     * Sets the value of the userRating property.
-     *
-     * @param value allowed object is
-     *              {@link Integer }
-     */
-    public void setUserRating(Integer value) {
-        this.userRating = value;
-    }
-
-    /**
-     * Gets the value of the averageRating property.
-     *
-     * @return possible object is
-     * {@link Double }
-     */
-    public Double getAverageRating() {
-        return averageRating;
-    }
-
-    /**
-     * Sets the value of the averageRating property.
-     *
-     * @param value allowed object is
-     *              {@link Double }
-     */
-    public void setAverageRating(Double value) {
-        this.averageRating = value;
-    }
-
-    /**
-     * Gets the value of the playCount property.
-     *
-     * @return possible object is
-     * {@link Long }
-     */
-    public Long getPlayCount() {
-        return playCount;
-    }
-
-    /**
-     * Sets the value of the playCount property.
-     *
-     * @param value allowed object is
-     *              {@link Long }
-     */
-    public void setPlayCount(Long value) {
-        this.playCount = value;
-    }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Error.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Error.kt
index 577894cd..f9271510 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Error.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Error.kt
@@ -1,29 +1,14 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.cappielloantonio.play.subsonic.utils.converter.ErrorCodeConverter;
-import com.tickaroo.tikxml.annotation.Attribute;
-import com.tickaroo.tikxml.annotation.Xml;
+import com.cappielloantonio.play.subsonic.utils.converter.ErrorCodeConverter
+import com.tickaroo.tikxml.annotation.Attribute
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class Error {
-    @Attribute(converter = ErrorCodeConverter.class)
-    protected ErrorCode code;
+class Error {
+    @Attribute(converter = ErrorCodeConverter::class)
+    var code: ErrorCode? = null
+
     @Attribute
-    protected String message;
-
-    public ErrorCode getCode() {
-        return code;
-    }
-
-    public void setCode(ErrorCode value) {
-        this.code = value;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String value) {
-        this.message = value;
-    }
-}
+    var message: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ErrorCode.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ErrorCode.kt
index b2f187f6..a7a313c8 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ErrorCode.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ErrorCode.kt
@@ -1,23 +1,16 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-public class ErrorCode {
-    public static int GENERIC_ERROR = 0;
-    public static int REQUIRED_PARAMETER_MISSING = 10;
-    public static int INCOMPATIBLE_VERSION_CLIENT = 20;
-    public static int INCOMPATIBLE_VERSION_SERVER = 30;
-    public static int WRONG_USERNAME_OR_PASSWORD = 40;
-    public static int TOKEN_AUTHENTICATION_NOT_SUPPORTED = 41;
-    public static int USER_NOT_AUTHORIZED = 50;
-    public static int TRIAL_PERIOD_OVER = 60;
-    public static int DATA_NOT_FOUND = 70;
+class ErrorCode(val value: Int) {
 
-    private final int value;
-
-    public ErrorCode(int value) {
-        this.value = value;
+    companion object {
+        var GENERIC_ERROR = 0
+        var REQUIRED_PARAMETER_MISSING = 10
+        var INCOMPATIBLE_VERSION_CLIENT = 20
+        var INCOMPATIBLE_VERSION_SERVER = 30
+        var WRONG_USERNAME_OR_PASSWORD = 40
+        var TOKEN_AUTHENTICATION_NOT_SUPPORTED = 41
+        var USER_NOT_AUTHORIZED = 50
+        var TRIAL_PERIOD_OVER = 60
+        var DATA_NOT_FOUND = 70
     }
-
-    public int getValue() {
-        return value;
-    }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Genre.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Genre.kt
index 117431f6..c2791eaa 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Genre.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Genre.kt
@@ -1,39 +1,20 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Attribute;
-import com.tickaroo.tikxml.annotation.TextContent;
-import com.tickaroo.tikxml.annotation.Xml;
+import android.os.Parcelable
+import com.tickaroo.tikxml.annotation.Attribute
+import com.tickaroo.tikxml.annotation.TextContent
+import com.tickaroo.tikxml.annotation.Xml
+import kotlinx.android.parcel.Parcelize
 
+@Parcelize
 @Xml
-public class Genre {
+class Genre : Parcelable {
     @TextContent
-    protected String genre;
+    var genre: String? = null
+
     @Attribute
-    protected int songCount;
+    var songCount = 0
+
     @Attribute
-    protected int albumCount;
-
-    public String getGenre() {
-        return genre;
-    }
-
-    public void setGenre(String value) {
-        this.genre = value;
-    }
-
-    public int getSongCount() {
-        return songCount;
-    }
-
-    public void setSongCount(int value) {
-        this.songCount = value;
-    }
-
-    public int getAlbumCount() {
-        return albumCount;
-    }
-
-    public void setAlbumCount(int value) {
-        this.albumCount = value;
-    }
-}
+    var albumCount = 0
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Genres.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Genres.kt
index 6458719a..4e7c5c23 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Genres.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Genres.kt
@@ -1,24 +1,10 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
-
-import java.util.ArrayList;
-import java.util.List;
+import com.tickaroo.tikxml.annotation.Element
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class Genres {
+class Genres {
     @Element
-    protected List<Genre> genres;
-
-    public List<Genre> getGenres() {
-        if (genres == null) {
-            genres = new ArrayList<>();
-        }
-        return this.genres;
-    }
-
-    public void setGenres(List<Genre> genres) {
-        this.genres = genres;
-    }
-}
+    var genres: List<Genre>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Index.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Index.kt
index b5a9ebf0..f92a133c 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Index.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Index.kt
@@ -1,56 +1,6 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class Index {
-    protected List<Artist> artists;
-    protected String name;
-
-    /**
-     * Gets the value of the artists property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the artists property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getArtists().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Artist }
-     */
-    public List<Artist> getArtists() {
-        if (artists == null) {
-            artists = new ArrayList<>();
-        }
-        return this.artists;
-    }
-
-    /**
-     * Gets the value of the name property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-}
+class Index {
+    var artists: List<Artist>? = null
+    var name: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/IndexID3.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/IndexID3.kt
index cb31eeae..8db2ffb9 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/IndexID3.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/IndexID3.kt
@@ -1,33 +1,11 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
-
-import java.util.ArrayList;
-import java.util.List;
+import com.tickaroo.tikxml.annotation.Element
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class IndexID3 {
+class IndexID3 {
     @Element(name = "artist")
-    protected List<ArtistID3> artists;
-    protected String name;
-
-    public List<ArtistID3> getArtists() {
-        if (artists == null) {
-            artists = new ArrayList<>();
-        }
-        return this.artists;
-    }
-
-    public void setArtists(List<ArtistID3> artists) {
-        this.artists = artists;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String value) {
-        this.name = value;
-    }
-}
+    var artists: List<ArtistID3>? = null
+    var name: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Indexes.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Indexes.kt
index 568396b7..9533356c 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Indexes.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Indexes.kt
@@ -1,127 +1,9 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class Indexes {
-    protected List<Artist> shortcuts;
-    protected List<Index> indices;
-    protected List<Child> children;
-    protected long lastModified;
-    protected String ignoredArticles;
-
-    /**
-     * Gets the value of the shortcuts property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the shortcuts property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getShortcuts().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Artist }
-     */
-    public List<Artist> getShortcuts() {
-        if (shortcuts == null) {
-            shortcuts = new ArrayList<>();
-        }
-        return this.shortcuts;
-    }
-
-    /**
-     * Gets the value of the indices property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the indices property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getIndices().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Index }
-     */
-    public List<Index> getIndices() {
-        if (indices == null) {
-            indices = new ArrayList<>();
-        }
-        return this.indices;
-    }
-
-    /**
-     * Gets the value of the children property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the children property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getchildren().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Child }
-     */
-    public List<Child> getchildren() {
-        if (children == null) {
-            children = new ArrayList<>();
-        }
-        return this.children;
-    }
-
-    /**
-     * Gets the value of the lastModified property.
-     */
-    public long getLastModified() {
-        return lastModified;
-    }
-
-    /**
-     * Sets the value of the lastModified property.
-     */
-    public void setLastModified(long value) {
-        this.lastModified = value;
-    }
-
-    /**
-     * Gets the value of the ignoredArticles property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getIgnoredArticles() {
-        return ignoredArticles;
-    }
-
-    /**
-     * Sets the value of the ignoredArticles property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setIgnoredArticles(String value) {
-        this.ignoredArticles = value;
-    }
-}
+class Indexes {
+    var shortcuts: List<Artist>? = null
+    var indices: List<Index>? = null
+    var children: List<Child>? = null
+    var lastModified: Long = 0
+    var ignoredArticles: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/InternetRadioStation.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/InternetRadioStation.kt
index 868dbe9b..6d9d0831 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/InternetRadioStation.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/InternetRadioStation.kt
@@ -1,88 +1,56 @@
-package com.cappielloantonio.play.subsonic.models;
-
-public class InternetRadioStation {
-    protected String id;
-    protected String name;
-    protected String streamUrl;
-    protected String homePageUrl;
+package com.cappielloantonio.play.subsonic.models
 
+class InternetRadioStation {
     /**
      * Gets the value of the id property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public String getId() {
-        return id;
-    }
-
     /**
      * Sets the value of the id property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setId(String value) {
-        this.id = value;
-    }
-
+    var id: String? = null
     /**
      * Gets the value of the name property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public String getName() {
-        return name;
-    }
-
     /**
      * Sets the value of the name property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setName(String value) {
-        this.name = value;
-    }
-
+    var name: String? = null
     /**
      * Gets the value of the streamUrl property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public String getStreamUrl() {
-        return streamUrl;
-    }
-
     /**
      * Sets the value of the streamUrl property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setStreamUrl(String value) {
-        this.streamUrl = value;
-    }
-
+    var streamUrl: String? = null
     /**
      * Gets the value of the homePageUrl property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public String getHomePageUrl() {
-        return homePageUrl;
-    }
-
     /**
      * Sets the value of the homePageUrl property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setHomePageUrl(String value) {
-        this.homePageUrl = value;
-    }
-}
+    var homePageUrl: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/InternetRadioStations.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/InternetRadioStations.kt
index adf9159c..3c96ba45 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/InternetRadioStations.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/InternetRadioStations.kt
@@ -1,36 +1,5 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class InternetRadioStations {
-    protected List<InternetRadioStation> internetRadioStations;
-
-    /**
-     * Gets the value of the internetRadioStations property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the internetRadioStations property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getInternetRadioStations().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link InternetRadioStation }
-     */
-    public List<InternetRadioStation> getInternetRadioStations() {
-        if (internetRadioStations == null) {
-            internetRadioStations = new ArrayList<>();
-        }
-        return this.internetRadioStations;
-    }
-
-}
+class InternetRadioStations {
+    var internetRadioStations: List<InternetRadioStation>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/JukeboxPlaylist.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/JukeboxPlaylist.kt
index 18c44b2c..d67bd20f 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/JukeboxPlaylist.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/JukeboxPlaylist.kt
@@ -1,35 +1,5 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class JukeboxPlaylist extends JukeboxStatus {
-    protected List<Child> entries;
-
-    /**
-     * Gets the value of the entries property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the entries property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getEntries().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Child }
-     */
-    public List<Child> getEntries() {
-        if (entries == null) {
-            entries = new ArrayList<>();
-        }
-        return this.entries;
-    }
-}
+class JukeboxPlaylist : JukeboxStatus() {
+    var entries: List<Child>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/JukeboxStatus.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/JukeboxStatus.kt
index ac950797..d0bb1f2c 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/JukeboxStatus.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/JukeboxStatus.kt
@@ -1,70 +1,38 @@
-package com.cappielloantonio.play.subsonic.models;
-
-public class JukeboxStatus {
-    protected int currentIndex;
-    protected boolean playing;
-    protected float gain;
-    protected Integer position;
+package com.cappielloantonio.play.subsonic.models
 
+open class JukeboxStatus {
     /**
      * Gets the value of the currentIndex property.
      */
-    public int getCurrentIndex() {
-        return currentIndex;
-    }
-
     /**
      * Sets the value of the currentIndex property.
      */
-    public void setCurrentIndex(int value) {
-        this.currentIndex = value;
-    }
-
+    var currentIndex = 0
     /**
      * Gets the value of the playing property.
      */
-    public boolean isPlaying() {
-        return playing;
-    }
-
     /**
      * Sets the value of the playing property.
      */
-    public void setPlaying(boolean value) {
-        this.playing = value;
-    }
-
+    var isPlaying = false
     /**
      * Gets the value of the gain property.
      */
-    public float getGain() {
-        return gain;
-    }
-
     /**
      * Sets the value of the gain property.
      */
-    public void setGain(float value) {
-        this.gain = value;
-    }
-
+    var gain = 0f
     /**
      * Gets the value of the position property.
      *
      * @return possible object is
-     * {@link Integer }
+     * [Integer]
      */
-    public Integer getPosition() {
-        return position;
-    }
-
     /**
      * Sets the value of the position property.
      *
      * @param value allowed object is
-     *              {@link Integer }
+     * [Integer]
      */
-    public void setPosition(Integer value) {
-        this.position = value;
-    }
-}
+    var position: Int? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/License.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/License.kt
index 0dcfea07..4dce074b 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/License.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/License.kt
@@ -1,84 +1,52 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.time.LocalDateTime;
-
-public class License {
-    protected boolean valid;
-    protected String email;
-    protected LocalDateTime licenseExpires;
-    protected LocalDateTime trialExpires;
+import java.time.LocalDateTime
 
+class License {
     /**
      * Gets the value of the valid property.
      */
-    public boolean isValid() {
-        return valid;
-    }
-
     /**
      * Sets the value of the valid property.
      */
-    public void setValid(boolean value) {
-        this.valid = value;
-    }
-
+    var isValid = false
     /**
      * Gets the value of the email property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public String getEmail() {
-        return email;
-    }
-
     /**
      * Sets the value of the email property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setEmail(String value) {
-        this.email = value;
-    }
-
+    var email: String? = null
     /**
      * Gets the value of the licenseExpires property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public LocalDateTime getLicenseExpires() {
-        return licenseExpires;
-    }
-
     /**
      * Sets the value of the licenseExpires property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setLicenseExpires(LocalDateTime value) {
-        this.licenseExpires = value;
-    }
-
+    var licenseExpires: LocalDateTime? = null
     /**
      * Gets the value of the trialExpires property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public LocalDateTime getTrialExpires() {
-        return trialExpires;
-    }
-
     /**
      * Sets the value of the trialExpires property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setTrialExpires(LocalDateTime value) {
-        this.trialExpires = value;
-    }
-}
+    var trialExpires: LocalDateTime? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Lyrics.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Lyrics.kt
index edaec4dd..bd1ce6a6 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Lyrics.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Lyrics.kt
@@ -1,39 +1,17 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Attribute;
-import com.tickaroo.tikxml.annotation.TextContent;
-import com.tickaroo.tikxml.annotation.Xml;
+import com.tickaroo.tikxml.annotation.Attribute
+import com.tickaroo.tikxml.annotation.TextContent
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml(name = "lyrics")
-public class Lyrics {
+class Lyrics {
     @TextContent
-    protected String content;
+    var content: String? = null
+
     @Attribute
-    protected String artist;
+    var artist: String? = null
+
     @Attribute
-    protected String title;
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String value) {
-        this.content = value;
-    }
-
-    public String getArtist() {
-        return artist;
-    }
-
-    public void setArtist(String value) {
-        this.artist = value;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String value) {
-        this.title = value;
-    }
-}
+    var title: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/MediaType.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/MediaType.kt
index 3cd6a2e1..673829e3 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/MediaType.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/MediaType.kt
@@ -1,23 +1,17 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Attribute;
-import com.tickaroo.tikxml.annotation.Xml;
+import com.tickaroo.tikxml.annotation.Attribute
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class MediaType {
-    public static String MUSIC = "music";
-    public static String PODCAST = "podcast";
-    public static String AUDIOBOOK = "audiobook";
-    public static String VIDEO = "video";
-
+class MediaType {
     @Attribute
-    private String value;
+    var value: String? = null
 
-    public String getValue() {
-        return value;
+    companion object {
+        var MUSIC = "music"
+        var PODCAST = "podcast"
+        var AUDIOBOOK = "audiobook"
+        var VIDEO = "video"
     }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/MusicFolder.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/MusicFolder.kt
index e64389d5..eeec0dbf 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/MusicFolder.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/MusicFolder.kt
@@ -1,28 +1,13 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Attribute;
-import com.tickaroo.tikxml.annotation.Xml;
+import com.tickaroo.tikxml.annotation.Attribute
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class MusicFolder {
+class MusicFolder {
     @Attribute
-    protected int id;
+    var id = 0
+
     @Attribute
-    protected String name;
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int value) {
-        this.id = value;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String value) {
-        this.name = value;
-    }
-}
+    var name: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/MusicFolders.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/MusicFolders.kt
index 016bdb42..0fb0111b 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/MusicFolders.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/MusicFolders.kt
@@ -1,24 +1,10 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
-
-import java.util.ArrayList;
-import java.util.List;
+import com.tickaroo.tikxml.annotation.Element
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class MusicFolders {
+class MusicFolders {
     @Element
-    protected List<MusicFolder> musicFolders;
-
-    public List<MusicFolder> getMusicFolders() {
-        if (musicFolders == null) {
-            musicFolders = new ArrayList<>();
-        }
-        return this.musicFolders;
-    }
-
-    public void setMusicFolders(List<MusicFolder> musicFolders) {
-        this.musicFolders = musicFolders;
-    }
-}
+    var musicFolders: List<MusicFolder>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/NewestPodcasts.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/NewestPodcasts.kt
index dd0f88e0..b463d158 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/NewestPodcasts.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/NewestPodcasts.kt
@@ -1,24 +1,10 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
-
-import java.util.ArrayList;
-import java.util.List;
+import com.tickaroo.tikxml.annotation.Element
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class NewestPodcasts {
+class NewestPodcasts {
     @Element(name = "episode")
-    protected List<PodcastEpisode> episodes;
-
-    public List<PodcastEpisode> getEpisodes() {
-        if (episodes == null) {
-            episodes = new ArrayList<>();
-        }
-        return this.episodes;
-    }
-
-    public void setEpisodes(List<PodcastEpisode> episodes) {
-        this.episodes = episodes;
-    }
-}
+    var episodes: List<PodcastEpisode>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/NowPlaying.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/NowPlaying.kt
index 69dc7504..fe70859d 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/NowPlaying.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/NowPlaying.kt
@@ -1,35 +1,5 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class NowPlaying {
-    protected List<NowPlayingEntry> entries;
-
-    /**
-     * Gets the value of the entries property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the entries property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getEntries().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link NowPlayingEntry }
-     */
-    public List<NowPlayingEntry> getEntries() {
-        if (entries == null) {
-            entries = new ArrayList<>();
-        }
-        return this.entries;
-    }
-}
+class NowPlaying {
+    var entries: List<NowPlayingEntry>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/NowPlayingEntry.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/NowPlayingEntry.kt
index b0ef2074..886cc144 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/NowPlayingEntry.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/NowPlayingEntry.kt
@@ -1,76 +1,11 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-public class NowPlayingEntry extends Child {
-    protected String username;
-    protected int minutesAgo;
-    protected int playerId;
-    protected String playerName;
+import kotlinx.android.parcel.Parcelize
 
-    /**
-     * Gets the value of the username property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getUsername() {
-        return username;
-    }
-
-    /**
-     * Sets the value of the username property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setUsername(String value) {
-        this.username = value;
-    }
-
-    /**
-     * Gets the value of the minutesAgo property.
-     */
-    public int getMinutesAgo() {
-        return minutesAgo;
-    }
-
-    /**
-     * Sets the value of the minutesAgo property.
-     */
-    public void setMinutesAgo(int value) {
-        this.minutesAgo = value;
-    }
-
-    /**
-     * Gets the value of the playerId property.
-     */
-    public int getPlayerId() {
-        return playerId;
-    }
-
-    /**
-     * Sets the value of the playerId property.
-     */
-    public void setPlayerId(int value) {
-        this.playerId = value;
-    }
-
-    /**
-     * Gets the value of the playerName property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getPlayerName() {
-        return playerName;
-    }
-
-    /**
-     * Sets the value of the playerName property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setPlayerName(String value) {
-        this.playerName = value;
-    }
-}
+@Parcelize
+class NowPlayingEntry(override val id: String) : Child(id) {
+    var username: String? = null
+    var minutesAgo = 0
+    var playerId = 0
+    var playerName: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ObjectFactory.java b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ObjectFactory.java
deleted file mode 100644
index 0c41e534..00000000
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ObjectFactory.java
+++ /dev/null
@@ -1,443 +0,0 @@
-package com.cappielloantonio.play.subsonic.models;
-
-public class ObjectFactory {
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.subsonic.restapi
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link SubsonicResponse }
-     */
-    public SubsonicResponse createSubsonicResponse() {
-        return new SubsonicResponse();
-    }
-
-    /**
-     * Create an instance of {@link Error }
-     */
-    public Error createError() {
-        return new Error();
-    }
-
-    /**
-     * Create an instance of {@link ScanStatus }
-     */
-    public ScanStatus createScanStatus() {
-        return new ScanStatus();
-    }
-
-    /**
-     * Create an instance of {@link TopSongs }
-     */
-    public TopSongs createTopSongs() {
-        return new TopSongs();
-    }
-
-    /**
-     * Create an instance of {@link SimilarSongs2 }
-     */
-    public SimilarSongs2 createSimilarSongs2() {
-        return new SimilarSongs2();
-    }
-
-    /**
-     * Create an instance of {@link SimilarSongs }
-     */
-    public SimilarSongs createSimilarSongs() {
-        return new SimilarSongs();
-    }
-
-    /**
-     * Create an instance of {@link ArtistInfo2 }
-     */
-    public ArtistInfo2 createArtistInfo2() {
-        return new ArtistInfo2();
-    }
-
-    /**
-     * Create an instance of {@link ArtistInfo }
-     */
-    public ArtistInfo createArtistInfo() {
-        return new ArtistInfo();
-    }
-
-    /**
-     * Create an instance of {@link AlbumInfo }
-     */
-    public AlbumInfo createAlbumInfo() {
-        return new AlbumInfo();
-    }
-
-    /**
-     * Create an instance of {@link Starred2 }
-     */
-    public Starred2 createStarred2() {
-        return new Starred2();
-    }
-
-    /**
-     * Create an instance of {@link Starred }
-     */
-    public Starred createStarred() {
-        return new Starred();
-    }
-
-    /**
-     * Create an instance of {@link Shares }
-     */
-    public Shares createShares() {
-        return new Shares();
-    }
-
-    /**
-     * Create an instance of {@link PlayQueue }
-     */
-    public PlayQueue createPlayQueue() {
-        return new PlayQueue();
-    }
-
-    /**
-     * Create an instance of {@link Bookmarks }
-     */
-    public Bookmarks createBookmarks() {
-        return new Bookmarks();
-    }
-
-    /**
-     * Create an instance of {@link InternetRadioStations }
-     */
-    public InternetRadioStations createInternetRadioStations() {
-        return new InternetRadioStations();
-    }
-
-    /**
-     * Create an instance of {@link NewestPodcasts }
-     */
-    public NewestPodcasts createNewestPodcasts() {
-        return new NewestPodcasts();
-    }
-
-    /**
-     * Create an instance of {@link Podcasts }
-     */
-    public Podcasts createPodcasts() {
-        return new Podcasts();
-    }
-
-    /**
-     * Create an instance of {@link Lyrics }
-     */
-    public Lyrics createLyrics() {
-        return new Lyrics();
-    }
-
-    /**
-     * Create an instance of {@link Songs }
-     */
-    public Songs createSongs() {
-        return new Songs();
-    }
-
-    /**
-     * Create an instance of {@link AlbumList2 }
-     */
-    public AlbumList2 createAlbumList2() {
-        return new AlbumList2();
-    }
-
-    /**
-     * Create an instance of {@link AlbumList }
-     */
-    public AlbumList createAlbumList() {
-        return new AlbumList();
-    }
-
-    /**
-     * Create an instance of {@link ChatMessages }
-     */
-    public ChatMessages createChatMessages() {
-        return new ChatMessages();
-    }
-
-    /**
-     * Create an instance of {@link User }
-     */
-    public User createUser() {
-        return new User();
-    }
-
-    /**
-     * Create an instance of {@link Users }
-     */
-    public Users createUsers() {
-        return new Users();
-    }
-
-    /**
-     * Create an instance of {@link License }
-     */
-    public License createLicense() {
-        return new License();
-    }
-
-    /**
-     * Create an instance of {@link JukeboxPlaylist }
-     */
-    public JukeboxPlaylist createJukeboxPlaylist() {
-        return new JukeboxPlaylist();
-    }
-
-    /**
-     * Create an instance of {@link JukeboxStatus }
-     */
-    public JukeboxStatus createJukeboxStatus() {
-        return new JukeboxStatus();
-    }
-
-    /**
-     * Create an instance of {@link PlaylistWithSongs }
-     */
-    public PlaylistWithSongs createPlaylistWithSongs() {
-        return new PlaylistWithSongs();
-    }
-
-    /**
-     * Create an instance of {@link Playlists }
-     */
-    public Playlists createPlaylists() {
-        return new Playlists();
-    }
-
-    /**
-     * Create an instance of {@link SearchResult3 }
-     */
-    public SearchResult3 createSearchResult3() {
-        return new SearchResult3();
-    }
-
-    /**
-     * Create an instance of {@link SearchResult2 }
-     */
-    public SearchResult2 createSearchResult2() {
-        return new SearchResult2();
-    }
-
-    /**
-     * Create an instance of {@link SearchResult }
-     */
-    public SearchResult createSearchResult() {
-        return new SearchResult();
-    }
-
-    /**
-     * Create an instance of {@link NowPlaying }
-     */
-    public NowPlaying createNowPlaying() {
-        return new NowPlaying();
-    }
-
-    /**
-     * Create an instance of {@link VideoInfo }
-     */
-    public VideoInfo createVideoInfo() {
-        return new VideoInfo();
-    }
-
-    /**
-     * Create an instance of {@link Videos }
-     */
-    public Videos createVideos() {
-        return new Videos();
-    }
-
-    /**
-     * Create an instance of {@link Child }
-     */
-    public Child createChild() {
-        return new Child();
-    }
-
-    /**
-     * Create an instance of {@link AlbumWithSongsID3 }
-     */
-    public AlbumWithSongsID3 createAlbumWithSongsID3() {
-        return new AlbumWithSongsID3();
-    }
-
-    /**
-     * Create an instance of {@link ArtistWithAlbumsID3 }
-     */
-    public ArtistWithAlbumsID3 createArtistWithAlbumsID3() {
-        return new ArtistWithAlbumsID3();
-    }
-
-    /**
-     * Create an instance of {@link ArtistsID3 }
-     */
-    public ArtistsID3 createArtistsID3() {
-        return new ArtistsID3();
-    }
-
-    /**
-     * Create an instance of {@link Genres }
-     */
-    public Genres createGenres() {
-        return new Genres();
-    }
-
-    /**
-     * Create an instance of {@link Directory }
-     */
-    public Directory createDirectory() {
-        return new Directory();
-    }
-
-    /**
-     * Create an instance of {@link Indexes }
-     */
-    public Indexes createIndexes() {
-        return new Indexes();
-    }
-
-    /**
-     * Create an instance of {@link MusicFolders }
-     */
-    public MusicFolders createMusicFolders() {
-        return new MusicFolders();
-    }
-
-    /**
-     * Create an instance of {@link MusicFolder }
-     */
-    public MusicFolder createMusicFolder() {
-        return new MusicFolder();
-    }
-
-    /**
-     * Create an instance of {@link Index }
-     */
-    public Index createIndex() {
-        return new Index();
-    }
-
-    /**
-     * Create an instance of {@link Artist }
-     */
-    public Artist createArtist() {
-        return new Artist();
-    }
-
-    /**
-     * Create an instance of {@link Genre }
-     */
-    public Genre createGenre() {
-        return new Genre();
-    }
-
-    /**
-     * Create an instance of {@link IndexID3 }
-     */
-    public IndexID3 createIndexID3() {
-        return new IndexID3();
-    }
-
-    /**
-     * Create an instance of {@link ArtistID3 }
-     */
-    public ArtistID3 createArtistID3() {
-        return new ArtistID3();
-    }
-
-    /**
-     * Create an instance of {@link AlbumID3 }
-     */
-    public AlbumID3 createAlbumID3() {
-        return new AlbumID3();
-    }
-
-    /**
-     * Create an instance of {@link Captions }
-     */
-    public Captions createCaptions() {
-        return new Captions();
-    }
-
-    /**
-     * Create an instance of {@link AudioTrack }
-     */
-    public AudioTrack createAudioTrack() {
-        return new AudioTrack();
-    }
-
-    /**
-     * Create an instance of {@link VideoConversion }
-     */
-    public VideoConversion createVideoConversion() {
-        return new VideoConversion();
-    }
-
-    /**
-     * Create an instance of {@link NowPlayingEntry }
-     */
-    public NowPlayingEntry createNowPlayingEntry() {
-        return new NowPlayingEntry();
-    }
-
-    /**
-     * Create an instance of {@link Playlist }
-     */
-    public Playlist createPlaylist() {
-        return new Playlist();
-    }
-
-    /**
-     * Create an instance of {@link ChatMessage }
-     */
-    public ChatMessage createChatMessage() {
-        return new ChatMessage();
-    }
-
-    /**
-     * Create an instance of {@link PodcastChannel }
-     */
-    public PodcastChannel createPodcastChannel() {
-        return new PodcastChannel();
-    }
-
-    /**
-     * Create an instance of {@link PodcastEpisode }
-     */
-    public PodcastEpisode createPodcastEpisode() {
-        return new PodcastEpisode();
-    }
-
-    /**
-     * Create an instance of {@link InternetRadioStation }
-     */
-    public InternetRadioStation createInternetRadioStation() {
-        return new InternetRadioStation();
-    }
-
-    /**
-     * Create an instance of {@link Bookmark }
-     */
-    public Bookmark createBookmark() {
-        return new Bookmark();
-    }
-
-    /**
-     * Create an instance of {@link Share }
-     */
-    public Share createShare() {
-        return new Share();
-    }
-
-    /**
-     * Create an instance of {@link ArtistInfoBase }
-     */
-    public ArtistInfoBase createArtistInfoBase() {
-        return new ArtistInfoBase();
-    }
-}
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/PlayQueue.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/PlayQueue.kt
index 09cc643b..b5abcce4 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/PlayQueue.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/PlayQueue.kt
@@ -1,141 +1,12 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
+import java.time.LocalDateTime
 
-public class PlayQueue {
-    protected List<Child> entries;
-    protected Integer current;
-    protected Long position;
-    protected String username;
-    protected LocalDateTime changed;
-    protected String changedBy;
-
-    /**
-     * Gets the value of the entries property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the entries property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getEntries().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Child }
-     */
-    public List<Child> getEntries() {
-        if (entries == null) {
-            entries = new ArrayList<>();
-        }
-        return this.entries;
-    }
-
-    /**
-     * Gets the value of the current property.
-     *
-     * @return possible object is
-     * {@link Integer }
-     */
-    public Integer getCurrent() {
-        return current;
-    }
-
-    /**
-     * Sets the value of the current property.
-     *
-     * @param value allowed object is
-     *              {@link Integer }
-     */
-    public void setCurrent(Integer value) {
-        this.current = value;
-    }
-
-    /**
-     * Gets the value of the position property.
-     *
-     * @return possible object is
-     * {@link Long }
-     */
-    public Long getPosition() {
-        return position;
-    }
-
-    /**
-     * Sets the value of the position property.
-     *
-     * @param value allowed object is
-     *              {@link Long }
-     */
-    public void setPosition(Long value) {
-        this.position = value;
-    }
-
-    /**
-     * Gets the value of the username property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getUsername() {
-        return username;
-    }
-
-    /**
-     * Sets the value of the username property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setUsername(String value) {
-        this.username = value;
-    }
-
-    /**
-     * Gets the value of the changed property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public LocalDateTime getChanged() {
-        return changed;
-    }
-
-    /**
-     * Sets the value of the changed property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setChanged(LocalDateTime value) {
-        this.changed = value;
-    }
-
-    /**
-     * Gets the value of the changedBy property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getChangedBy() {
-        return changedBy;
-    }
-
-    /**
-     * Sets the value of the changedBy property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setChangedBy(String value) {
-        this.changedBy = value;
-    }
-}
+class PlayQueue {
+    var entries: List<Child>? = null
+    var current: Int? = null
+    var position: Long? = null
+    var username: String? = null
+    var changed: LocalDateTime? = null
+    var changedBy: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Playlist.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Playlist.kt
index 99f9b930..6af3a42d 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Playlist.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Playlist.kt
@@ -1,125 +1,64 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Attribute;
-import com.tickaroo.tikxml.annotation.Xml;
-import com.tickaroo.tikxml.converters.date.rfc3339.DateRfc3339TypeConverter;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import android.os.Parcelable
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.Ignore
+import androidx.room.PrimaryKey
+import com.tickaroo.tikxml.annotation.Attribute
+import com.tickaroo.tikxml.annotation.Xml
+import com.tickaroo.tikxml.converters.date.rfc3339.DateRfc3339TypeConverter
+import kotlinx.android.parcel.Parcelize
+import java.util.*
 
+@Parcelize
+@Entity(tableName = "playlist")
 @Xml
-public class Playlist {
-    protected List<String> allowedUsers;
+open class Playlist : Parcelable {
+    @PrimaryKey
+    @ColumnInfo(name = "id")
     @Attribute
-    protected String id;
+    lateinit var id: String
+
+    @ColumnInfo(name = "name")
     @Attribute
-    protected String name;
+    var name: String? = null
+
+    @Ignore
     @Attribute
-    protected String comment;
+    var comment: String? = null
+
+    @Ignore
     @Attribute
-    protected String owner;
+    var owner: String? = null
+
+    @Ignore
     @Attribute(name = "public")
-    protected Boolean universal;
+    var isUniversal: Boolean? = null
+
+    @Ignore
     @Attribute
-    protected int songCount;
+    var songCount: Int = 0
+
+    @Ignore
+    @ColumnInfo(name = "duration")
     @Attribute
-    protected int duration;
-    @Attribute(converter = DateRfc3339TypeConverter.class)
-    protected Date created;
-    @Attribute(converter = DateRfc3339TypeConverter.class)
-    protected Date changed;
+    var duration: Long = 0
+
+    @Ignore
+    @Attribute(converter = DateRfc3339TypeConverter::class)
+    var created: Date? = null
+
+    @Ignore
+    @Attribute(converter = DateRfc3339TypeConverter::class)
+    var changed: Date? = null
+
+    @Ignore
+    @ColumnInfo(name = "coverArt")
     @Attribute
-    protected String coverArtId;
+    var coverArtId: String? = null
 
-    public List<String> getAllowedUsers() {
-        if (allowedUsers == null) {
-            allowedUsers = new ArrayList<>();
-        }
-        return this.allowedUsers;
-    }
-
-    public void setAllowedUsers(List<String> allowedUsers) {
-        this.allowedUsers = allowedUsers;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    public String getComment() {
-        return comment;
-    }
-
-    public void setComment(String value) {
-        this.comment = value;
-    }
-
-    public String getOwner() {
-        return owner;
-    }
-
-    public void setOwner(String value) {
-        this.owner = value;
-    }
-
-    public Boolean isUniversal() {
-        return universal;
-    }
-
-    public void setUniversal(Boolean value) {
-        this.universal = value;
-    }
-
-    public int getSongCount() {
-        return songCount;
-    }
-
-    public void setSongCount(int value) {
-        this.songCount = value;
-    }
-
-    public int getDuration() {
-        return duration;
-    }
-
-    public void setDuration(int value) {
-        this.duration = value;
-    }
-
-    public Date getCreated() {
-        return created;
-    }
-
-    public void setCreated(Date value) {
-        this.created = value;
-    }
-
-    public Date getChanged() {
-        return changed;
-    }
-
-    public void setChanged(Date value) {
-        this.changed = value;
-    }
-
-    public String getCoverArtId() {
-        return coverArtId;
-    }
-
-    public void setCoverArtId(String value) {
-        this.coverArtId = value;
-    }
-}
+    @Ignore
+    @Attribute
+    var allowedUsers: List<String>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/PlaylistWithSongs.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/PlaylistWithSongs.kt
index d03a8c3c..069b99df 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/PlaylistWithSongs.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/PlaylistWithSongs.kt
@@ -1,24 +1,13 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
-
-import java.util.ArrayList;
-import java.util.List;
+import android.os.Parcelable
+import com.tickaroo.tikxml.annotation.Element
+import com.tickaroo.tikxml.annotation.Xml
+import kotlinx.android.parcel.Parcelize
 
+@Parcelize
 @Xml
-public class PlaylistWithSongs extends Playlist {
+class PlaylistWithSongs : Playlist(), Parcelable {
     @Element(name = "entry")
-    protected List<Child> entries;
-
-    public List<Child> getEntries() {
-        if (entries == null) {
-            entries = new ArrayList<>();
-        }
-        return this.entries;
-    }
-
-    public void setEntries(List<Child> entries) {
-        this.entries = entries;
-    }
-}
+    var entries: List<Child>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Playlists.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Playlists.kt
index 298a2d1b..b61b3aea 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Playlists.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Playlists.kt
@@ -1,24 +1,10 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
-
-import java.util.ArrayList;
-import java.util.List;
+import com.tickaroo.tikxml.annotation.Element
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class Playlists {
+class Playlists {
     @Element(name = "playlist")
-    protected List<Playlist> playlists;
-
-    public List<Playlist> getPlaylists() {
-        if (playlists == null) {
-            playlists = new ArrayList<>();
-        }
-        return this.playlists;
-    }
-
-    public void setPlaylists(List<Playlist> playlists) {
-        this.playlists = playlists;
-    }
-}
+    var playlists: List<Playlist>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/PodcastChannel.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/PodcastChannel.kt
index fbc9967e..06f84ab0 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/PodcastChannel.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/PodcastChannel.kt
@@ -1,105 +1,38 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Attribute;
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
-
-import java.util.ArrayList;
-import java.util.List;
+import android.os.Parcelable
+import com.tickaroo.tikxml.annotation.Attribute
+import com.tickaroo.tikxml.annotation.Element
+import com.tickaroo.tikxml.annotation.Xml
+import kotlinx.android.parcel.Parcelize
 
+@Parcelize
 @Xml
-public class PodcastChannel {
+class PodcastChannel : Parcelable {
     @Element(name = "episode")
-    protected List<PodcastEpisode> episodes;
+    var episodes: List<PodcastEpisode>? = null
+
     @Attribute
-    protected String id;
+    var id: String? = null
+
     @Attribute
-    protected String url;
+    var url: String? = null
+
     @Attribute
-    protected String title;
+    var title: String? = null
+
     @Attribute
-    protected String description;
+    var description: String? = null
+
     @Attribute
-    protected String coverArtId;
+    var coverArtId: String? = null
+
     @Attribute
-    protected String originalImageUrl;
+    var originalImageUrl: String? = null
+
     @Attribute
-    protected String status;
+    var status: String? = null
+
     @Attribute
-    protected String errorMessage;
-
-    public List<PodcastEpisode> getEpisodes() {
-        if (episodes == null) {
-            episodes = new ArrayList<>();
-        }
-        return this.episodes;
-    }
-
-    public void setEpisodes(List<PodcastEpisode> episodes) {
-        this.episodes = episodes;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String value) {
-        this.url = value;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String value) {
-        this.title = value;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-    public String getCoverArtId() {
-        return coverArtId;
-    }
-
-    public void setCoverArtId(String value) {
-        this.coverArtId = value;
-    }
-
-    public String getOriginalImageUrl() {
-        return originalImageUrl;
-    }
-
-    public void setOriginalImageUrl(String value) {
-        this.originalImageUrl = value;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String value) {
-        this.status = value;
-    }
-
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
-    public void setErrorMessage(String value) {
-        this.errorMessage = value;
-    }
-}
+    var errorMessage: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/PodcastEpisode.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/PodcastEpisode.kt
index 1aaf240c..1e0625e2 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/PodcastEpisode.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/PodcastEpisode.kt
@@ -1,372 +1,120 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Attribute;
-import com.tickaroo.tikxml.annotation.Xml;
-import com.tickaroo.tikxml.converters.date.rfc3339.DateRfc3339TypeConverter;
-
-import java.util.Date;
+import android.os.Parcelable
+import com.tickaroo.tikxml.annotation.Attribute
+import com.tickaroo.tikxml.annotation.Xml
+import com.tickaroo.tikxml.converters.date.rfc3339.DateRfc3339TypeConverter
+import kotlinx.android.parcel.Parcelize
+import java.util.*
 
+@Parcelize
 @Xml
-public class PodcastEpisode {
+class PodcastEpisode : Parcelable {
     @Attribute
-    protected String id;
+    var id: String? = null
+
     @Attribute(name = "parent")
-    protected String parentId;
+    var parentId: String? = null
+
     @Attribute(name = "isDir")
-    protected boolean dir;
+    var isDir = false
+
     @Attribute
-    protected String title;
+    var title: String? = null
+
     @Attribute
-    protected String album;
+    var album: String? = null
+
     @Attribute
-    protected String artist;
+    var artist: String? = null
+
     @Attribute
-    protected Integer track;
+    var track: Int? = null
+
     @Attribute
-    protected Integer year;
+    var year: Int? = null
+
     @Attribute(name = "genre")
-    protected String genre;
+    var genre: String? = null
+
     @Attribute(name = "coverArt")
-    protected String coverArtId;
+    var coverArtId: String? = null
+
     @Attribute
-    protected Long size;
+    var size: Long? = null
+
     @Attribute
-    protected String contentType;
+    var contentType: String? = null
+
     @Attribute
-    protected String suffix;
+    var suffix: String? = null
+
     @Attribute
-    protected String transcodedContentType;
+    var transcodedContentType: String? = null
+
     @Attribute
-    protected String transcodedSuffix;
+    var transcodedSuffix: String? = null
+
     @Attribute
-    protected Integer duration;
+    var duration: Int? = null
+
     @Attribute
-    protected Integer bitRate;
+    var bitRate: Int? = null
+
     @Attribute
-    protected String path;
+    var path: String? = null
+
     @Attribute(name = "isVideo")
-    protected Boolean video;
-    @Attribute
-    protected Integer userRating;
-    @Attribute
-    protected Double averageRating;
-    @Attribute
-    protected Long playCount;
-    @Attribute
-    protected Integer discNumber;
-    @Attribute(converter = DateRfc3339TypeConverter.class)
-    protected Date created;
-    @Attribute(converter = DateRfc3339TypeConverter.class)
-    protected Date starred;
-    @Attribute
-    protected String albumId;
-    @Attribute
-    protected String artistId;
-    @Attribute
-    protected String type;
-    @Attribute
-    protected Long bookmarkPosition;
-    @Attribute
-    protected Integer originalWidth;
-    @Attribute
-    protected Integer originalHeight;
+    var video: Boolean? = null
 
     @Attribute
-    protected String streamId;
+    var userRating: Int? = null
+
     @Attribute
-    protected String channelId;
+    var averageRating: Double? = null
+
     @Attribute
-    protected String description;
+    var playCount: Long? = null
+
     @Attribute
-    protected String status;
-    @Attribute(converter = DateRfc3339TypeConverter.class)
-    protected Date publishDate;
+    var discNumber: Int? = null
 
-    public String getId() {
-        return id;
-    }
+    @Attribute(converter = DateRfc3339TypeConverter::class)
+    var created: Date? = null
 
-    public void setId(String id) {
-        this.id = id;
-    }
+    @Attribute(converter = DateRfc3339TypeConverter::class)
+    var starred: Date? = null
 
-    public String getParentId() {
-        return parentId;
-    }
+    @Attribute
+    var albumId: String? = null
 
-    public void setParentId(String parentId) {
-        this.parentId = parentId;
-    }
+    @Attribute
+    var artistId: String? = null
 
-    public boolean isDir() {
-        return dir;
-    }
+    @Attribute
+    var type: String? = null
 
-    public void setDir(boolean dir) {
-        this.dir = dir;
-    }
+    @Attribute
+    var bookmarkPosition: Long? = null
 
-    public String getTitle() {
-        return title;
-    }
+    @Attribute
+    var originalWidth: Int? = null
 
-    public void setTitle(String title) {
-        this.title = title;
-    }
+    @Attribute
+    var originalHeight: Int? = null
 
-    public String getAlbum() {
-        return album;
-    }
+    @Attribute
+    var streamId: String? = null
 
-    public void setAlbum(String album) {
-        this.album = album;
-    }
+    @Attribute
+    var channelId: String? = null
 
-    public String getArtist() {
-        return artist;
-    }
+    @Attribute
+    var description: String? = null
 
-    public void setArtist(String artist) {
-        this.artist = artist;
-    }
+    @Attribute
+    var status: String? = null
 
-    public Integer getTrack() {
-        return track;
-    }
-
-    public void setTrack(Integer track) {
-        this.track = track;
-    }
-
-    public Integer getYear() {
-        return year;
-    }
-
-    public void setYear(Integer year) {
-        this.year = year;
-    }
-
-    public String getGenre() {
-        return genre;
-    }
-
-    public void setGenre(String genre) {
-        this.genre = genre;
-    }
-
-    public String getCoverArtId() {
-        return coverArtId;
-    }
-
-    public void setCoverArtId(String coverArtId) {
-        this.coverArtId = coverArtId;
-    }
-
-    public Long getSize() {
-        return size;
-    }
-
-    public void setSize(Long size) {
-        this.size = size;
-    }
-
-    public String getContentType() {
-        return contentType;
-    }
-
-    public void setContentType(String contentType) {
-        this.contentType = contentType;
-    }
-
-    public String getSuffix() {
-        return suffix;
-    }
-
-    public void setSuffix(String suffix) {
-        this.suffix = suffix;
-    }
-
-    public String getTranscodedContentType() {
-        return transcodedContentType;
-    }
-
-    public void setTranscodedContentType(String transcodedContentType) {
-        this.transcodedContentType = transcodedContentType;
-    }
-
-    public String getTranscodedSuffix() {
-        return transcodedSuffix;
-    }
-
-    public void setTranscodedSuffix(String transcodedSuffix) {
-        this.transcodedSuffix = transcodedSuffix;
-    }
-
-    public Integer getDuration() {
-        return duration;
-    }
-
-    public void setDuration(Integer duration) {
-        this.duration = duration;
-    }
-
-    public Integer getBitRate() {
-        return bitRate;
-    }
-
-    public void setBitRate(Integer bitRate) {
-        this.bitRate = bitRate;
-    }
-
-    public String getPath() {
-        return path;
-    }
-
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    public Boolean getVideo() {
-        return video;
-    }
-
-    public void setVideo(Boolean video) {
-        this.video = video;
-    }
-
-    public Integer getUserRating() {
-        return userRating;
-    }
-
-    public void setUserRating(Integer userRating) {
-        this.userRating = userRating;
-    }
-
-    public Double getAverageRating() {
-        return averageRating;
-    }
-
-    public void setAverageRating(Double averageRating) {
-        this.averageRating = averageRating;
-    }
-
-    public Long getPlayCount() {
-        return playCount;
-    }
-
-    public void setPlayCount(Long playCount) {
-        this.playCount = playCount;
-    }
-
-    public Integer getDiscNumber() {
-        return discNumber;
-    }
-
-    public void setDiscNumber(Integer discNumber) {
-        this.discNumber = discNumber;
-    }
-
-    public Date getCreated() {
-        return created;
-    }
-
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-    public Date getStarred() {
-        return starred;
-    }
-
-    public void setStarred(Date starred) {
-        this.starred = starred;
-    }
-
-    public String getAlbumId() {
-        return albumId;
-    }
-
-    public void setAlbumId(String albumId) {
-        this.albumId = albumId;
-    }
-
-    public String getArtistId() {
-        return artistId;
-    }
-
-    public void setArtistId(String artistId) {
-        this.artistId = artistId;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public Long getBookmarkPosition() {
-        return bookmarkPosition;
-    }
-
-    public void setBookmarkPosition(Long bookmarkPosition) {
-        this.bookmarkPosition = bookmarkPosition;
-    }
-
-    public Integer getOriginalWidth() {
-        return originalWidth;
-    }
-
-    public void setOriginalWidth(Integer originalWidth) {
-        this.originalWidth = originalWidth;
-    }
-
-    public Integer getOriginalHeight() {
-        return originalHeight;
-    }
-
-    public void setOriginalHeight(Integer originalHeight) {
-        this.originalHeight = originalHeight;
-    }
-
-    public String getStreamId() {
-        return streamId;
-    }
-
-    public void setStreamId(String value) {
-        this.streamId = value;
-    }
-
-    public String getChannelId() {
-        return channelId;
-    }
-
-    public void setChannelId(String value) {
-        this.channelId = value;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String value) {
-        this.status = value;
-    }
-
-    public Date getPublishDate() {
-        return publishDate;
-    }
-
-    public void setPublishDate(Date value) {
-        this.publishDate = value;
-    }
-}
+    @Attribute(converter = DateRfc3339TypeConverter::class)
+    var publishDate: Date? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/PodcastStatus.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/PodcastStatus.kt
index 1d7db49c..6b33e9ef 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/PodcastStatus.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/PodcastStatus.kt
@@ -1,25 +1,19 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Attribute;
-import com.tickaroo.tikxml.annotation.Xml;
+import com.tickaroo.tikxml.annotation.Attribute
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class PodcastStatus {
-    public static String NEW = "new";
-    public static String DOWNLOADING = "downloading";
-    public static String COMPLETED = "completed";
-    public static String ERROR = "error";
-    public static String DELETED = "deleted";
-    public static String SKIPPED = "skipped";
-
+class PodcastStatus {
     @Attribute
-    private String value;
+    var value: String? = null
 
-    public String getValue() {
-        return value;
+    companion object {
+        var NEW = "new"
+        var DOWNLOADING = "downloading"
+        var COMPLETED = "completed"
+        var ERROR = "error"
+        var DELETED = "deleted"
+        var SKIPPED = "skipped"
     }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Podcasts.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Podcasts.kt
index 5ec3d755..37690b52 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Podcasts.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Podcasts.kt
@@ -1,24 +1,10 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
-
-import java.util.ArrayList;
-import java.util.List;
+import com.tickaroo.tikxml.annotation.Element
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class Podcasts {
+class Podcasts {
     @Element(name = "channel")
-    protected List<PodcastChannel> channels;
-
-    public List<PodcastChannel> getChannels() {
-        if (channels == null) {
-            channels = new ArrayList<>();
-        }
-        return this.channels;
-    }
-
-    public void setChannels(List<PodcastChannel> channels) {
-        this.channels = channels;
-    }
-}
+    var channels: List<PodcastChannel>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ResponseStatus.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ResponseStatus.kt
index a347a4b5..ba866fc2 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ResponseStatus.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ResponseStatus.kt
@@ -1,20 +1,16 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Attribute;
-import com.tickaroo.tikxml.annotation.Xml;
+import com.tickaroo.tikxml.annotation.Attribute
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class ResponseStatus {
-    public static String OK = "ok";
-    public static String FAILED = "failed";
+class ResponseStatus(@param:Attribute val value: String) {
 
-    private final String value;
+    companion object {
+        @JvmField
+        var OK = "ok"
 
-    public ResponseStatus(@Attribute String value) {
-        this.value = value;
+        @JvmField
+        var FAILED = "failed"
     }
-
-    public String getValue() {
-        return value;
-    }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ScanStatus.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ScanStatus.kt
index 06c82e9f..e3cfd5f3 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/ScanStatus.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/ScanStatus.kt
@@ -1,28 +1,13 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Attribute;
-import com.tickaroo.tikxml.annotation.Xml;
+import com.tickaroo.tikxml.annotation.Attribute
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class ScanStatus {
+class ScanStatus {
     @Attribute
-    protected boolean scanning;
+    var isScanning = false
+
     @Attribute
-    protected Long count;
-    
-    public boolean isScanning() {
-        return scanning;
-    }
-
-    public void setScanning(boolean value) {
-        this.scanning = value;
-    }
-
-    public Long getCount() {
-        return count;
-    }
-
-    public void setCount(Long value) {
-        this.count = value;
-    }
-}
+    var count: Long? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult.kt
index 5528ea8c..72f0f6d8 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult.kt
@@ -1,65 +1,7 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class SearchResult {
-    protected List<Child> matches;
-    protected int offset;
-    protected int totalHits;
-
-    /**
-     * Gets the value of the matches property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the matches property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getMatches().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Child }
-     */
-    public List<Child> getMatches() {
-        if (matches == null) {
-            matches = new ArrayList<>();
-        }
-        return this.matches;
-    }
-
-    /**
-     * Gets the value of the offset property.
-     */
-    public int getOffset() {
-        return offset;
-    }
-
-    /**
-     * Sets the value of the offset property.
-     */
-    public void setOffset(int value) {
-        this.offset = value;
-    }
-
-    /**
-     * Gets the value of the totalHits property.
-     */
-    public int getTotalHits() {
-        return totalHits;
-    }
-
-    /**
-     * Sets the value of the totalHits property.
-     */
-    public void setTotalHits(int value) {
-        this.totalHits = value;
-    }
-}
+class SearchResult {
+    var matches: List<Child>? = null
+    var offset = 0
+    var totalHits = 0
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult2.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult2.kt
index b642e1e9..1d12c39d 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult2.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult2.kt
@@ -1,50 +1,16 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
-
-import java.util.ArrayList;
-import java.util.List;
+import com.tickaroo.tikxml.annotation.Element
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class SearchResult2 {
+class SearchResult2 {
     @Element(name = "artist")
-    protected List<Artist> artists;
+    var artists: List<Artist>? = null
+
     @Element(name = "album")
-    protected List<Child> albums;
+    var albums: List<Child>? = null
+
     @Element(name = "song")
-    protected List<Child> songs;
-
-    public List<Artist> getArtists() {
-        if (artists == null) {
-            artists = new ArrayList<>();
-        }
-        return this.artists;
-    }
-
-    public void setArtists(List<Artist> artists) {
-        this.artists = artists;
-    }
-
-    public List<Child> getAlbums() {
-        if (albums == null) {
-            albums = new ArrayList<>();
-        }
-        return this.albums;
-    }
-
-    public void setAlbums(List<Child> albums) {
-        this.albums = albums;
-    }
-
-    public List<Child> getSongs() {
-        if (songs == null) {
-            songs = new ArrayList<>();
-        }
-        return this.songs;
-    }
-
-    public void setSongs(List<Child> songs) {
-        this.songs = songs;
-    }
-}
+    var songs: List<Child>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult3.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult3.kt
index 7cf435e4..99fdf20c 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult3.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/SearchResult3.kt
@@ -1,50 +1,16 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
-
-import java.util.ArrayList;
-import java.util.List;
+import com.tickaroo.tikxml.annotation.Element
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class SearchResult3 {
+class SearchResult3 {
     @Element(name = "artist")
-    protected List<ArtistID3> artists;
+    var artists: List<ArtistID3>? = null
+
     @Element(name = "album")
-    protected List<AlbumID3> albums;
+    var albums: List<AlbumID3>? = null
+
     @Element(name = "song")
-    protected List<Child> songs;
-
-    public List<ArtistID3> getArtists() {
-        if (artists == null) {
-            artists = new ArrayList<>();
-        }
-        return this.artists;
-    }
-
-    public List<AlbumID3> getAlbums() {
-        if (albums == null) {
-            albums = new ArrayList<>();
-        }
-        return this.albums;
-    }
-
-    public List<Child> getSongs() {
-        if (songs == null) {
-            songs = new ArrayList<>();
-        }
-        return this.songs;
-    }
-
-    public void setArtists(List<ArtistID3> artists) {
-        this.artists = artists;
-    }
-
-    public void setAlbums(List<AlbumID3> albums) {
-        this.albums = albums;
-    }
-
-    public void setSongs(List<Child> songs) {
-        this.songs = songs;
-    }
-}
+    var songs: List<Child>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Share.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Share.kt
index c0861d71..2f1cc040 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Share.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Share.kt
@@ -1,198 +1,15 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
+import java.time.LocalDateTime
 
-public class Share {
-    protected List<Child> entries;
-    protected String id;
-    protected String url;
-    protected String description;
-    protected String username;
-    protected LocalDateTime created;
-    protected LocalDateTime expires;
-    protected LocalDateTime lastVisited;
-    protected int visitCount;
-
-    /**
-     * Gets the value of the entries property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the entries property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getEntries().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Child }
-     */
-    public List<Child> getEntries() {
-        if (entries == null) {
-            entries = new ArrayList<>();
-        }
-        return this.entries;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the url property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getUrl() {
-        return url;
-    }
-
-    /**
-     * Sets the value of the url property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setUrl(String value) {
-        this.url = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the username property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getUsername() {
-        return username;
-    }
-
-    /**
-     * Sets the value of the username property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setUsername(String value) {
-        this.username = value;
-    }
-
-    /**
-     * Gets the value of the created property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public LocalDateTime getCreated() {
-        return created;
-    }
-
-    /**
-     * Sets the value of the created property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setCreated(LocalDateTime value) {
-        this.created = value;
-    }
-
-    /**
-     * Gets the value of the expires property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public LocalDateTime getExpires() {
-        return expires;
-    }
-
-    /**
-     * Sets the value of the expires property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setExpires(LocalDateTime value) {
-        this.expires = value;
-    }
-
-    /**
-     * Gets the value of the lastVisited property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public LocalDateTime getLastVisited() {
-        return lastVisited;
-    }
-
-    /**
-     * Sets the value of the lastVisited property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setLastVisited(LocalDateTime value) {
-        this.lastVisited = value;
-    }
-
-    /**
-     * Gets the value of the visitCount property.
-     */
-    public int getVisitCount() {
-        return visitCount;
-    }
-
-    /**
-     * Sets the value of the visitCount property.
-     */
-    public void setVisitCount(int value) {
-        this.visitCount = value;
-    }
-}
+class Share {
+    var entries: List<Child>? = null
+    var id: String? = null
+    var url: String? = null
+    var description: String? = null
+    var username: String? = null
+    var created: LocalDateTime? = null
+    var expires: LocalDateTime? = null
+    var lastVisited: LocalDateTime? = null
+    var visitCount = 0
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Shares.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Shares.kt
index 65ffc95b..c9d65675 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Shares.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Shares.kt
@@ -1,35 +1,5 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class Shares {
-    protected List<Share> shares;
-
-    /**
-     * Gets the value of the shares property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the shares property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getShares().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Share }
-     */
-    public List<Share> getShares() {
-        if (shares == null) {
-            shares = new ArrayList<>();
-        }
-        return this.shares;
-    }
-}
+class Shares {
+    var shares: List<Share>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/SimilarArtistID3.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/SimilarArtistID3.kt
index 85f58df3..e344f9a2 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/SimilarArtistID3.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/SimilarArtistID3.kt
@@ -1,48 +1,22 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Attribute;
-import com.tickaroo.tikxml.annotation.Xml;
+import android.os.Parcelable
+import com.tickaroo.tikxml.annotation.Attribute
+import com.tickaroo.tikxml.annotation.Xml
+import kotlinx.android.parcel.Parcelize
 
+@Parcelize
 @Xml(name = "similarArtist")
-public class SimilarArtistID3 {
+class SimilarArtistID3 : Parcelable {
     @Attribute
-    protected String id;
+    var id: String? = null
+
     @Attribute
-    protected String name;
+    var name: String? = null
+
     @Attribute(name = "coverArt")
-    protected String coverArtId;
+    var coverArtId: String? = null
+
     @Attribute
-    protected int albumCount;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    public String getCoverArtId() {
-        return coverArtId;
-    }
-
-    public void setCoverArtId(String value) {
-        this.coverArtId = value;
-    }
-
-    public int getAlbumCount() {
-        return albumCount;
-    }
-
-    public void setAlbumCount(int value) {
-        this.albumCount = value;
-    }
-}
+    var albumCount = 0
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/SimilarSongs.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/SimilarSongs.kt
index ee676a99..46d6ccd2 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/SimilarSongs.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/SimilarSongs.kt
@@ -1,35 +1,5 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class SimilarSongs {
-    protected List<Child> songs;
-
-    /**
-     * Gets the value of the songs property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the songs property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSongs().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Child }
-     */
-    public List<Child> getSongs() {
-        if (songs == null) {
-            songs = new ArrayList<>();
-        }
-        return this.songs;
-    }
-}
+class SimilarSongs {
+    var songs: List<Child>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/SimilarSongs2.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/SimilarSongs2.kt
index 6bb90559..a5e7cb07 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/SimilarSongs2.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/SimilarSongs2.kt
@@ -1,24 +1,10 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
-
-import java.util.ArrayList;
-import java.util.List;
+import com.tickaroo.tikxml.annotation.Element
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class SimilarSongs2 {
+class SimilarSongs2 {
     @Element(name = "song")
-    protected List<Child> songs;
-
-    public List<Child> getSongs() {
-        if (songs == null) {
-            songs = new ArrayList<>();
-        }
-        return this.songs;
-    }
-
-    public void setSongs(List<Child> songs) {
-        this.songs = songs;
-    }
-}
+    var songs: List<Child>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Songs.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Songs.kt
index 75c8dfd0..69d754ce 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Songs.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Songs.kt
@@ -1,24 +1,10 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
-
-import java.util.ArrayList;
-import java.util.List;
+import com.tickaroo.tikxml.annotation.Element
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class Songs {
+class Songs {
     @Element(name = "song")
-    protected List<Child> songs;
-
-    public List<Child> getSongs() {
-        if (songs == null) {
-            songs = new ArrayList<>();
-        }
-        return this.songs;
-    }
-
-    public void setSongs(List<Child> songs) {
-        this.songs = songs;
-    }
-}
+    var songs: List<Child>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Starred.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Starred.kt
index dc456b65..ee71fe6f 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Starred.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Starred.kt
@@ -1,91 +1,7 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class Starred {
-    protected List<Artist> artists;
-    protected List<Child> albums;
-    protected List<Child> songs;
-
-    /**
-     * Gets the value of the artists property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the artists property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getArtists().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Artist }
-     */
-    public List<Artist> getArtists() {
-        if (artists == null) {
-            artists = new ArrayList<>();
-        }
-        return this.artists;
-    }
-
-    /**
-     * Gets the value of the albums property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the albums property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAlbums().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Child }
-     */
-    public List<Child> getAlbums() {
-        if (albums == null) {
-            albums = new ArrayList<>();
-        }
-        return this.albums;
-    }
-
-    /**
-     * Gets the value of the songs property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the songs property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSongs().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Child }
-     */
-    public List<Child> getSongs() {
-        if (songs == null) {
-            songs = new ArrayList<>();
-        }
-        return this.songs;
-    }
-}
+class Starred {
+    var artists: List<Artist>? = null
+    var albums: List<Child>? = null
+    var songs: List<Child>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Starred2.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Starred2.kt
index 55961335..2c874b7a 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Starred2.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Starred2.kt
@@ -1,50 +1,16 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
-
-import java.util.ArrayList;
-import java.util.List;
+import com.tickaroo.tikxml.annotation.Element
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class Starred2 {
+class Starred2 {
     @Element(name = "artist")
-    protected List<ArtistID3> artists;
+    var artists: List<ArtistID3>? = null
+
     @Element(name = "album")
-    protected List<AlbumID3> albums;
+    var albums: List<AlbumID3>? = null
+
     @Element(name = "song")
-    protected List<Child> songs;
-
-    public List<ArtistID3> getArtists() {
-        if (artists == null) {
-            artists = new ArrayList<>();
-        }
-        return this.artists;
-    }
-
-    public void setArtists(List<ArtistID3> artists) {
-        this.artists = artists;
-    }
-
-    public List<AlbumID3> getAlbums() {
-        if (albums == null) {
-            albums = new ArrayList<>();
-        }
-        return this.albums;
-    }
-
-    public void setAlbums(List<AlbumID3> albums) {
-        this.albums = albums;
-    }
-
-    public List<Child> getSongs() {
-        if (songs == null) {
-            songs = new ArrayList<>();
-        }
-        return this.songs;
-    }
-
-    public void setSongs(List<Child> songs) {
-        this.songs = songs;
-    }
-}
+    var songs: List<Child>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/SubsonicResponse.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/SubsonicResponse.kt
index ba43f97b..be2ccd42 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/SubsonicResponse.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/SubsonicResponse.kt
@@ -1,449 +1,108 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.cappielloantonio.play.subsonic.utils.converter.ResponseStatusConverter;
-import com.tickaroo.tikxml.annotation.Attribute;
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
+import com.cappielloantonio.play.subsonic.utils.converter.ResponseStatusConverter
+import com.tickaroo.tikxml.annotation.Attribute
+import com.tickaroo.tikxml.annotation.Element
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml(name = "subsonic-response")
-public class SubsonicResponse {
+class SubsonicResponse {
     @Element
-    private Error error;
+    var error: Error? = null
+
     @Element(name = "scanStatus")
-    private ScanStatus scanStatus;
+    var scanStatus: ScanStatus? = null
+
     @Element(name = "topSongs")
-    private TopSongs topSongs;
+    var topSongs: TopSongs? = null
+
     @Element(name = "similarSongs2")
-    private SimilarSongs2 similarSongs2;
-    private SimilarSongs similarSongs;
+    var similarSongs2: SimilarSongs2? = null
+    var similarSongs: SimilarSongs? = null
+
     @Element(name = "artistInfo2")
-    private ArtistInfo2 artistInfo2;
-    private ArtistInfo artistInfo;
+    var artistInfo2: ArtistInfo2? = null
+    var artistInfo: ArtistInfo? = null
+
     @Element(name = "albumInfo")
-    private AlbumInfo albumInfo;
+    var albumInfo: AlbumInfo? = null
+
     @Element(name = "starred2")
-    private Starred2 starred2;
-    private Starred starred;
-    private Shares shares;
-    private PlayQueue playQueue;
-    private Bookmarks bookmarks;
-    private InternetRadioStations internetRadioStations;
+    var starred2: Starred2? = null
+    var starred: Starred? = null
+    var shares: Shares? = null
+    var playQueue: PlayQueue? = null
+    var bookmarks: Bookmarks? = null
+    var internetRadioStations: InternetRadioStations? = null
+
     @Element(name = "newestPodcasts")
-    private NewestPodcasts newestPodcasts;
-    private Podcasts podcasts;
+    var newestPodcasts: NewestPodcasts? = null
+    var podcasts: Podcasts? = null
+
     @Element(name = "lyrics")
-    private Lyrics lyrics;
+    var lyrics: Lyrics? = null
+
     @Element(name = "songsByGenre")
-    private Songs songsByGenre;
+    var songsByGenre: Songs? = null
+
     @Element(name = "randomSongs")
-    private Songs randomSongs;
+    var randomSongs: Songs? = null
+
     @Element
-    private AlbumList2 albumList2;
-    private AlbumList albumList;
-    private ChatMessages chatMessages;
-    private User user;
-    private Users users;
-    private License license;
-    private JukeboxPlaylist jukeboxPlaylist;
-    private JukeboxStatus jukeboxStatus;
+    var albumList2: AlbumList2? = null
+    var albumList: AlbumList? = null
+    var chatMessages: ChatMessages? = null
+    var user: User? = null
+    var users: Users? = null
+    var license: License? = null
+    var jukeboxPlaylist: JukeboxPlaylist? = null
+    var jukeboxStatus: JukeboxStatus? = null
+
     @Element(name = "playlist")
-    private PlaylistWithSongs playlist;
+    var playlist: PlaylistWithSongs? = null
+
     @Element
-    private Playlists playlists;
+    var playlists: Playlists? = null
+
     @Element
-    private SearchResult3 searchResult3;
+    var searchResult3: SearchResult3? = null
+
     @Element
-    private SearchResult2 searchResult2;
-    private SearchResult searchResult;
-    private NowPlaying nowPlaying;
-    private VideoInfo videoInfo;
-    private Videos videos;
+    var searchResult2: SearchResult2? = null
+    var searchResult: SearchResult? = null
+    var nowPlaying: NowPlaying? = null
+    var videoInfo: VideoInfo? = null
+    var videos: Videos? = null
+
     @Element(name = "song")
-    private Child song;
+    var song: Child? = null
+
     @Element(name = "album")
-    private AlbumWithSongsID3 album;
+    var album: AlbumWithSongsID3? = null
+
     @Element(name = "artist")
-    private ArtistWithAlbumsID3 artist;
+    var artist: ArtistWithAlbumsID3? = null
+
     @Element(name = "artists")
-    private ArtistsID3 artists;
+    var artists: ArtistsID3? = null
+
     @Element
-    private Genres genres;
-    private Directory directory;
-    private Indexes indexes;
+    var genres: Genres? = null
+    var directory: Directory? = null
+    var indexes: Indexes? = null
+
     @Element
-    private MusicFolders musicFolders;
-    @Attribute(converter = ResponseStatusConverter.class)
-    private ResponseStatus status;
+    var musicFolders: MusicFolders? = null
+
+    @Attribute(converter = ResponseStatusConverter::class)
+    var status: ResponseStatus? = null
+
     @Attribute
-    private String version;
+    var version: String? = null
+
     @Attribute
-    private String type;
+    var type: String? = null
 
-    public Error getError() {
-        return error;
-    }
-
-    public void setError(Error value) {
-        this.error = value;
-    }
-
-    public ScanStatus getScanStatus() {
-        return scanStatus;
-    }
-
-    public void setScanStatus(ScanStatus value) {
-        this.scanStatus = value;
-    }
-
-    public TopSongs getTopSongs() {
-        return topSongs;
-    }
-
-    public void setTopSongs(TopSongs value) {
-        this.topSongs = value;
-    }
-
-    public SimilarSongs2 getSimilarSongs2() {
-        return similarSongs2;
-    }
-
-    public void setSimilarSongs2(SimilarSongs2 value) {
-        this.similarSongs2 = value;
-    }
-
-    public SimilarSongs getSimilarSongs() {
-        return similarSongs;
-    }
-
-    public void setSimilarSongs(SimilarSongs value) {
-        this.similarSongs = value;
-    }
-
-    public ArtistInfo2 getArtistInfo2() {
-        return artistInfo2;
-    }
-
-    public void setArtistInfo2(ArtistInfo2 value) {
-        this.artistInfo2 = value;
-    }
-
-    public ArtistInfo getArtistInfo() {
-        return artistInfo;
-    }
-
-    public void setArtistInfo(ArtistInfo value) {
-        this.artistInfo = value;
-    }
-
-    public AlbumInfo getAlbumInfo() {
-        return albumInfo;
-    }
-
-    public void setAlbumInfo(AlbumInfo value) {
-        this.albumInfo = value;
-    }
-
-    public Starred2 getStarred2() {
-        return starred2;
-    }
-
-    public void setStarred2(Starred2 value) {
-        this.starred2 = value;
-    }
-
-    public Starred getStarred() {
-        return starred;
-    }
-
-    public void setStarred(Starred value) {
-        this.starred = value;
-    }
-
-    public Shares getShares() {
-        return shares;
-    }
-
-    public void setShares(Shares value) {
-        this.shares = value;
-    }
-
-    public PlayQueue getPlayQueue() {
-        return playQueue;
-    }
-
-    public void setPlayQueue(PlayQueue value) {
-        this.playQueue = value;
-    }
-
-    public Bookmarks getBookmarks() {
-        return bookmarks;
-    }
-
-    public void setBookmarks(Bookmarks value) {
-        this.bookmarks = value;
-    }
-
-    public InternetRadioStations getInternetRadioStations() {
-        return internetRadioStations;
-    }
-
-    public void setInternetRadioStations(InternetRadioStations value) {
-        this.internetRadioStations = value;
-    }
-
-    public NewestPodcasts getNewestPodcasts() {
-        return newestPodcasts;
-    }
-
-    public void setNewestPodcasts(NewestPodcasts value) {
-        this.newestPodcasts = value;
-    }
-
-    public Podcasts getPodcasts() {
-        return podcasts;
-    }
-
-    public void setPodcasts(Podcasts value) {
-        this.podcasts = value;
-    }
-
-    public Lyrics getLyrics() {
-        return lyrics;
-    }
-
-    public void setLyrics(Lyrics value) {
-        this.lyrics = value;
-    }
-
-    public Songs getSongsByGenre() {
-        return songsByGenre;
-    }
-
-    public void setSongsByGenre(Songs value) {
-        this.songsByGenre = value;
-    }
-
-    public Songs getRandomSongs() {
-        return randomSongs;
-    }
-
-    public void setRandomSongs(Songs value) {
-        this.randomSongs = value;
-    }
-
-    public AlbumList2 getAlbumList2() {
-        return albumList2;
-    }
-
-    public void setAlbumList2(AlbumList2 value) {
-        this.albumList2 = value;
-    }
-
-    public AlbumList getAlbumList() {
-        return albumList;
-    }
-
-    public void setAlbumList(AlbumList value) {
-        this.albumList = value;
-    }
-
-    public ChatMessages getChatMessages() {
-        return chatMessages;
-    }
-
-    public void setChatMessages(ChatMessages value) {
-        this.chatMessages = value;
-    }
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User value) {
-        this.user = value;
-    }
-
-    public Users getUsers() {
-        return users;
-    }
-
-    public void setUsers(Users value) {
-        this.users = value;
-    }
-
-    public License getLicense() {
-        return license;
-    }
-
-    public void setLicense(License value) {
-        this.license = value;
-    }
-
-    public JukeboxPlaylist getJukeboxPlaylist() {
-        return jukeboxPlaylist;
-    }
-
-    public void setJukeboxPlaylist(JukeboxPlaylist value) {
-        this.jukeboxPlaylist = value;
-    }
-
-    public JukeboxStatus getJukeboxStatus() {
-        return jukeboxStatus;
-    }
-
-    public void setJukeboxStatus(JukeboxStatus value) {
-        this.jukeboxStatus = value;
-    }
-
-    public PlaylistWithSongs getPlaylist() {
-        return playlist;
-    }
-
-    public void setPlaylist(PlaylistWithSongs value) {
-        this.playlist = value;
-    }
-
-    public Playlists getPlaylists() {
-        return playlists;
-    }
-
-    public void setPlaylists(Playlists value) {
-        this.playlists = value;
-    }
-
-    public SearchResult3 getSearchResult3() {
-        return searchResult3;
-    }
-
-    public void setSearchResult3(SearchResult3 value) {
-        this.searchResult3 = value;
-    }
-
-    public SearchResult2 getSearchResult2() {
-        return searchResult2;
-    }
-
-    public void setSearchResult2(SearchResult2 value) {
-        this.searchResult2 = value;
-    }
-
-    public SearchResult getSearchResult() {
-        return searchResult;
-    }
-
-    public void setSearchResult(SearchResult value) {
-        this.searchResult = value;
-    }
-
-    public NowPlaying getNowPlaying() {
-        return nowPlaying;
-    }
-
-    public void setNowPlaying(NowPlaying value) {
-        this.nowPlaying = value;
-    }
-
-    public VideoInfo getVideoInfo() {
-        return videoInfo;
-    }
-
-    public void setVideoInfo(VideoInfo value) {
-        this.videoInfo = value;
-    }
-
-    public Videos getVideos() {
-        return videos;
-    }
-
-    public void setVideos(Videos value) {
-        this.videos = value;
-    }
-
-    public Child getSong() {
-        return song;
-    }
-
-    public void setSong(Child value) {
-        this.song = value;
-    }
-
-    public AlbumWithSongsID3 getAlbum() {
-        return album;
-    }
-
-    public void setAlbum(AlbumWithSongsID3 value) {
-        this.album = value;
-    }
-
-    public ArtistWithAlbumsID3 getArtist() {
-        return artist;
-    }
-
-    public void setArtist(ArtistWithAlbumsID3 value) {
-        this.artist = value;
-    }
-
-    public ArtistsID3 getArtists() {
-        return artists;
-    }
-
-    public void setArtists(ArtistsID3 value) {
-        this.artists = value;
-    }
-
-    public Genres getGenres() {
-        return genres;
-    }
-
-    public void setGenres(Genres value) {
-        this.genres = value;
-    }
-
-    public Directory getDirectory() {
-        return directory;
-    }
-
-    public void setDirectory(Directory value) {
-        this.directory = value;
-    }
-
-    public Indexes getIndexes() {
-        return indexes;
-    }
-
-    public void setIndexes(Indexes value) {
-        this.indexes = value;
-    }
-
-    public MusicFolders getMusicFolders() {
-        return musicFolders;
-    }
-
-    public void setMusicFolders(MusicFolders value) {
-        this.musicFolders = value;
-    }
-
-    public ResponseStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(ResponseStatus value) {
-        this.status = value;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String value) {
-        this.version = value;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String value) {
-        this.type = value;
-    }
-}
+    @Attribute
+    var serverVersion: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/TopSongs.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/TopSongs.kt
index 489dcdc3..bb856bb3 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/TopSongs.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/TopSongs.kt
@@ -1,24 +1,10 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.Xml;
-
-import java.util.ArrayList;
-import java.util.List;
+import com.tickaroo.tikxml.annotation.Element
+import com.tickaroo.tikxml.annotation.Xml
 
 @Xml
-public class TopSongs {
+class TopSongs {
     @Element(name = "song")
-    protected List<Child> songs;
-    
-    public List<Child> getSongs() {
-        if (songs == null) {
-            songs = new ArrayList<>();
-        }
-        return this.songs;
-    }
-
-    public void setSongs(List<Child> songs) {
-        this.songs = songs;
-    }
-}
+    var songs: List<Child>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/User.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/User.kt
index c0d89f2e..3dc9dc3a 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/User.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/User.kt
@@ -1,315 +1,24 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
+import java.time.LocalDateTime
 
-public class User {
-    protected List<Integer> folders;
-    protected String username;
-    protected String email;
-    protected boolean scrobblingEnabled;
-    protected Integer maxBitRate;
-    protected boolean adminRole;
-    protected boolean settingsRole;
-    protected boolean downloadRole;
-    protected boolean uploadRole;
-    protected boolean playlistRole;
-    protected boolean coverArtRole;
-    protected boolean commentRole;
-    protected boolean podcastRole;
-    protected boolean streamRole;
-    protected boolean jukeboxRole;
-    protected boolean shareRole;
-    protected boolean videoConversionRole;
-    protected LocalDateTime avatarLastChanged;
-
-    /**
-     * Gets the value of the folders property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the folders property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getFolders().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Integer }
-     */
-    public List<Integer> getFolders() {
-        if (folders == null) {
-            folders = new ArrayList<>();
-        }
-        return this.folders;
-    }
-
-    /**
-     * Gets the value of the username property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getUsername() {
-        return username;
-    }
-
-    /**
-     * Sets the value of the username property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setUsername(String value) {
-        this.username = value;
-    }
-
-    /**
-     * Gets the value of the email property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getEmail() {
-        return email;
-    }
-
-    /**
-     * Sets the value of the email property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setEmail(String value) {
-        this.email = value;
-    }
-
-    /**
-     * Gets the value of the scrobblingEnabled property.
-     */
-    public boolean isScrobblingEnabled() {
-        return scrobblingEnabled;
-    }
-
-    /**
-     * Sets the value of the scrobblingEnabled property.
-     */
-    public void setScrobblingEnabled(boolean value) {
-        this.scrobblingEnabled = value;
-    }
-
-    /**
-     * Gets the value of the maxBitRate property.
-     *
-     * @return possible object is
-     * {@link Integer }
-     */
-    public Integer getMaxBitRate() {
-        return maxBitRate;
-    }
-
-    /**
-     * Sets the value of the maxBitRate property.
-     *
-     * @param value allowed object is
-     *              {@link Integer }
-     */
-    public void setMaxBitRate(Integer value) {
-        this.maxBitRate = value;
-    }
-
-    /**
-     * Gets the value of the adminRole property.
-     */
-    public boolean isAdminRole() {
-        return adminRole;
-    }
-
-    /**
-     * Sets the value of the adminRole property.
-     */
-    public void setAdminRole(boolean value) {
-        this.adminRole = value;
-    }
-
-    /**
-     * Gets the value of the settingsRole property.
-     */
-    public boolean isSettingsRole() {
-        return settingsRole;
-    }
-
-    /**
-     * Sets the value of the settingsRole property.
-     */
-    public void setSettingsRole(boolean value) {
-        this.settingsRole = value;
-    }
-
-    /**
-     * Gets the value of the downloadRole property.
-     */
-    public boolean isDownloadRole() {
-        return downloadRole;
-    }
-
-    /**
-     * Sets the value of the downloadRole property.
-     */
-    public void setDownloadRole(boolean value) {
-        this.downloadRole = value;
-    }
-
-    /**
-     * Gets the value of the uploadRole property.
-     */
-    public boolean isUploadRole() {
-        return uploadRole;
-    }
-
-    /**
-     * Sets the value of the uploadRole property.
-     */
-    public void setUploadRole(boolean value) {
-        this.uploadRole = value;
-    }
-
-    /**
-     * Gets the value of the playlistRole property.
-     */
-    public boolean isPlaylistRole() {
-        return playlistRole;
-    }
-
-    /**
-     * Sets the value of the playlistRole property.
-     */
-    public void setPlaylistRole(boolean value) {
-        this.playlistRole = value;
-    }
-
-    /**
-     * Gets the value of the coverArtRole property.
-     */
-    public boolean isCoverArtRole() {
-        return coverArtRole;
-    }
-
-    /**
-     * Sets the value of the coverArtRole property.
-     */
-    public void setCoverArtRole(boolean value) {
-        this.coverArtRole = value;
-    }
-
-    /**
-     * Gets the value of the commentRole property.
-     */
-    public boolean isCommentRole() {
-        return commentRole;
-    }
-
-    /**
-     * Sets the value of the commentRole property.
-     */
-    public void setCommentRole(boolean value) {
-        this.commentRole = value;
-    }
-
-    /**
-     * Gets the value of the podcastRole property.
-     */
-    public boolean isPodcastRole() {
-        return podcastRole;
-    }
-
-    /**
-     * Sets the value of the podcastRole property.
-     */
-    public void setPodcastRole(boolean value) {
-        this.podcastRole = value;
-    }
-
-    /**
-     * Gets the value of the streamRole property.
-     */
-    public boolean isStreamRole() {
-        return streamRole;
-    }
-
-    /**
-     * Sets the value of the streamRole property.
-     */
-    public void setStreamRole(boolean value) {
-        this.streamRole = value;
-    }
-
-    /**
-     * Gets the value of the jukeboxRole property.
-     */
-    public boolean isJukeboxRole() {
-        return jukeboxRole;
-    }
-
-    /**
-     * Sets the value of the jukeboxRole property.
-     */
-    public void setJukeboxRole(boolean value) {
-        this.jukeboxRole = value;
-    }
-
-    /**
-     * Gets the value of the shareRole property.
-     */
-    public boolean isShareRole() {
-        return shareRole;
-    }
-
-    /**
-     * Sets the value of the shareRole property.
-     */
-    public void setShareRole(boolean value) {
-        this.shareRole = value;
-    }
-
-    /**
-     * Gets the value of the videoConversionRole property.
-     */
-    public boolean isVideoConversionRole() {
-        return videoConversionRole;
-    }
-
-    /**
-     * Sets the value of the videoConversionRole property.
-     */
-    public void setVideoConversionRole(boolean value) {
-        this.videoConversionRole = value;
-    }
-
-    /**
-     * Gets the value of the avatarLastChanged property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public LocalDateTime getAvatarLastChanged() {
-        return avatarLastChanged;
-    }
-
-    /**
-     * Sets the value of the avatarLastChanged property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setAvatarLastChanged(LocalDateTime value) {
-        this.avatarLastChanged = value;
-    }
-}
+class User {
+    var folders: List<Int>? = null
+    var username: String? = null
+    var email: String? = null
+    var isScrobblingEnabled = false
+    var maxBitRate: Int? = null
+    var isAdminRole = false
+    var isSettingsRole = false
+    var isDownloadRole = false
+    var isUploadRole = false
+    var isPlaylistRole = false
+    var isCoverArtRole = false
+    var isCommentRole = false
+    var isPodcastRole = false
+    var isStreamRole = false
+    var isJukeboxRole = false
+    var isShareRole = false
+    var isVideoConversionRole = false
+    var avatarLastChanged: LocalDateTime? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Users.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Users.kt
index 6f923473..441161ed 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Users.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Users.kt
@@ -1,35 +1,5 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class Users {
-    protected List<User> users;
-
-    /**
-     * Gets the value of the users property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the users property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getUsers().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link User }
-     */
-    public List<User> getUsers() {
-        if (users == null) {
-            users = new ArrayList<>();
-        }
-        return this.users;
-    }
-}
+class Users {
+    var users: List<User>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/VideoConversion.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/VideoConversion.kt
index 37c41745..eab29085 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/VideoConversion.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/VideoConversion.kt
@@ -1,67 +1,43 @@
-package com.cappielloantonio.play.subsonic.models;
-
-public class VideoConversion {
-    protected String id;
-    protected Integer bitRate;
-    protected Integer audioTrackId;
+package com.cappielloantonio.play.subsonic.models
 
+class VideoConversion {
     /**
      * Gets the value of the id property.
      *
      * @return possible object is
-     * {@link String }
+     * [String]
      */
-    public String getId() {
-        return id;
-    }
-
     /**
      * Sets the value of the id property.
      *
      * @param value allowed object is
-     *              {@link String }
+     * [String]
      */
-    public void setId(String value) {
-        this.id = value;
-    }
-
+    var id: String? = null
     /**
      * Gets the value of the bitRate property.
      *
      * @return possible object is
-     * {@link Integer }
+     * [Integer]
      */
-    public Integer getBitRate() {
-        return bitRate;
-    }
-
     /**
      * Sets the value of the bitRate property.
      *
      * @param value allowed object is
-     *              {@link Integer }
+     * [Integer]
      */
-    public void setBitRate(Integer value) {
-        this.bitRate = value;
-    }
-
+    var bitRate: Int? = null
     /**
      * Gets the value of the audioTrackId property.
      *
      * @return possible object is
-     * {@link Integer }
+     * [Integer]
      */
-    public Integer getAudioTrackId() {
-        return audioTrackId;
-    }
-
     /**
      * Sets the value of the audioTrackId property.
      *
      * @param value allowed object is
-     *              {@link Integer }
+     * [Integer]
      */
-    public void setAudioTrackId(Integer value) {
-        this.audioTrackId = value;
-    }
-}
+    var audioTrackId: Int? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/VideoInfo.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/VideoInfo.kt
index fdb13acd..8e69ab4a 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/VideoInfo.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/VideoInfo.kt
@@ -1,112 +1,8 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class VideoInfo {
-    protected List<Captions> captions;
-    protected List<AudioTrack> audioTracks;
-    protected List<VideoConversion> conversions;
-    protected String id;
-
-    /**
-     * Gets the value of the captions property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the captions property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getCaptions().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Captions }
-     */
-    public List<Captions> getCaptions() {
-        if (captions == null) {
-            captions = new ArrayList<>();
-        }
-        return this.captions;
-    }
-
-    /**
-     * Gets the value of the audioTracks property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the audioTracks property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAudioTracks().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AudioTrack }
-     */
-    public List<AudioTrack> getAudioTracks() {
-        if (audioTracks == null) {
-            audioTracks = new ArrayList<>();
-        }
-        return this.audioTracks;
-    }
-
-    /**
-     * Gets the value of the conversions property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the conversions property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getConversions().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link VideoConversion }
-     */
-    public List<VideoConversion> getConversions() {
-        if (conversions == null) {
-            conversions = new ArrayList<>();
-        }
-        return this.conversions;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-}
+class VideoInfo {
+    var captions: List<Captions>? = null
+    var audioTracks: List<AudioTrack>? = null
+    var conversions: List<VideoConversion>? = null
+    var id: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Videos.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Videos.kt
index 7524ca9d..8e881b19 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Videos.kt
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Videos.kt
@@ -1,35 +1,5 @@
-package com.cappielloantonio.play.subsonic.models;
+package com.cappielloantonio.play.subsonic.models
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class Videos {
-    protected List<Child> videos;
-
-    /**
-     * Gets the value of the videos property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the videos property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getVideos().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Child }
-     */
-    public List<Child> getVideos() {
-        if (videos == null) {
-            videos = new ArrayList<>();
-        }
-        return this.videos;
-    }
-}
+class Videos {
+    var videos: List<Child>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java b/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java
index bc349fba..8c122037 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java
@@ -24,7 +24,7 @@ import com.cappielloantonio.play.ui.activity.base.BaseActivity;
 import com.cappielloantonio.play.ui.dialog.ConnectionAlertDialog;
 import com.cappielloantonio.play.ui.dialog.ServerUnreachableDialog;
 import com.cappielloantonio.play.ui.fragment.PlayerBottomSheetFragment;
-import com.cappielloantonio.play.util.PreferenceUtil;
+import com.cappielloantonio.play.util.Preferences;
 import com.cappielloantonio.play.viewmodel.MainViewModel;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
@@ -98,7 +98,7 @@ public class MainActivity extends BaseActivity {
         initBottomSheet();
         initNavigation();
 
-        if (PreferenceUtil.getInstance(this).getPassword() != null || (PreferenceUtil.getInstance(this).getToken() != null && PreferenceUtil.getInstance(this).getSalt() != null)) {
+        if (Preferences.getPassword() != null || (Preferences.getToken() != null && Preferences.getSalt() != null)) {
             goFromLogin();
         } else {
             goToLogin();
@@ -258,12 +258,12 @@ public class MainActivity extends BaseActivity {
     }
 
     private void resetUserSession() {
-        PreferenceUtil.getInstance(this).setServerId(null);
-        PreferenceUtil.getInstance(this).setSalt(null);
-        PreferenceUtil.getInstance(this).setToken(null);
-        PreferenceUtil.getInstance(this).setPassword(null);
-        PreferenceUtil.getInstance(this).setServer(null);
-        PreferenceUtil.getInstance(this).setUser(null);
+        Preferences.setServerId(null);
+        Preferences.setSalt(null);
+        Preferences.setToken(null);
+        Preferences.setPassword(null);
+        Preferences.setServer(null);
+        Preferences.setUser(null);
     }
 
     private void resetMusicSession() {
@@ -289,7 +289,7 @@ public class MainActivity extends BaseActivity {
     }
 
     private void pingServer() {
-        if (PreferenceUtil.getInstance(this).getToken() != null) {
+        if (Preferences.getToken() != null) {
             mainViewModel.ping().observe(this, isPingSuccessfull -> {
                 if (!isPingSuccessfull) {
                     ServerUnreachableDialog dialog = new ServerUnreachableDialog();
@@ -300,7 +300,7 @@ public class MainActivity extends BaseActivity {
     }
 
     private void checkConnectionType() {
-        if (PreferenceUtil.getInstance(this).isWifiOnly()) {
+        if (Preferences.isWifiOnly()) {
             ConnectivityManager connectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
             if (connectivityManager.getActiveNetworkInfo().getType() != ConnectivityManager.TYPE_WIFI) {
                 ConnectionAlertDialog dialog = new ConnectionAlertDialog();
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/dialog/ConnectionAlertDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/dialog/ConnectionAlertDialog.java
index ad50f102..3d297c58 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/dialog/ConnectionAlertDialog.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/dialog/ConnectionAlertDialog.java
@@ -10,7 +10,7 @@ import androidx.fragment.app.DialogFragment;
 
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.databinding.DialogConnectionAlertBinding;
-import com.cappielloantonio.play.util.PreferenceUtil;
+import com.cappielloantonio.play.util.Preferences;
 
 import java.util.Objects;
 
@@ -31,8 +31,9 @@ public class ConnectionAlertDialog extends DialogFragment {
                 .setPositiveButton(R.string.connection_alert_dialog_positive_button, (dialog, id) -> dialog.cancel())
                 .setNegativeButton(R.string.connection_alert_dialog_negative_button, (dialog, id) -> dialog.cancel());
 
-        if(!PreferenceUtil.getInstance(requireContext()).isDataSavingMode()) {
-            builder.setNeutralButton(R.string.connection_alert_dialog_neutral_button, (dialog, id) -> { });
+        if (!Preferences.isDataSavingMode()) {
+            builder.setNeutralButton(R.string.connection_alert_dialog_neutral_button, (dialog, id) -> {
+            });
         }
 
         return builder.create();
@@ -53,7 +54,7 @@ public class ConnectionAlertDialog extends DialogFragment {
 
     private void setButtonAction() {
         ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(v -> {
-            PreferenceUtil.getInstance(requireContext()).setDataSavingMode(true);
+            Preferences.setDataSavingMode(true);
             Objects.requireNonNull(getDialog()).dismiss();
         });
     }
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/dialog/PlaylistChooserDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/dialog/PlaylistChooserDialog.java
index e0268b3d..7051aff7 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/dialog/PlaylistChooserDialog.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/dialog/PlaylistChooserDialog.java
@@ -15,7 +15,7 @@ import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.adapter.PlaylistDialogHorizontalAdapter;
 import com.cappielloantonio.play.databinding.DialogPlaylistChooserBinding;
 import com.cappielloantonio.play.interfaces.ClickCallback;
-import com.cappielloantonio.play.model.Playlist;
+import com.cappielloantonio.play.subsonic.models.Playlist;
 import com.cappielloantonio.play.viewmodel.PlaylistChooserViewModel;
 
 import java.util.Objects;
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/dialog/RatingDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/dialog/RatingDialog.java
index d6fd37e7..57078ac7 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/dialog/RatingDialog.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/dialog/RatingDialog.java
@@ -13,8 +13,6 @@ import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.databinding.DialogRatingBinding;
 import com.cappielloantonio.play.viewmodel.RatingViewModel;
 
-import java.util.Objects;
-
 public class RatingDialog extends DialogFragment {
     private static final String TAG = "ServerSignupDialog";
 
@@ -63,7 +61,7 @@ public class RatingDialog extends DialogFragment {
 
     private void setRating() {
         if (ratingViewModel.getSong() != null) {
-            ratingViewModel.getLiveSong().observe(getViewLifecycleOwner(), song -> bind.ratingBar.setRating(song.getRating()));
+            ratingViewModel.getLiveSong().observe(getViewLifecycleOwner(), song -> bind.ratingBar.setRating(song.getUserRating()));
         } else if (ratingViewModel.getAlbum() != null) {
             ratingViewModel.getLiveAlbum().observe(getViewLifecycleOwner(), album -> bind.ratingBar.setRating(/*album.getRating()*/ 0));
         } else if (ratingViewModel.getArtist() != null) {
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/dialog/StarredSyncDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/dialog/StarredSyncDialog.java
index dc997d37..dabbcd0f 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/dialog/StarredSyncDialog.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/dialog/StarredSyncDialog.java
@@ -14,7 +14,7 @@ import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.databinding.DialogConnectionAlertBinding;
 import com.cappielloantonio.play.util.DownloadUtil;
 import com.cappielloantonio.play.util.MappingUtil;
-import com.cappielloantonio.play.util.PreferenceUtil;
+import com.cappielloantonio.play.util.Preferences;
 import com.cappielloantonio.play.viewmodel.StarredSyncViewModel;
 
 import java.util.Objects;
@@ -71,7 +71,7 @@ public class StarredSyncDialog extends DialogFragment {
         });
 
         ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(v -> {
-            PreferenceUtil.getInstance(requireContext()).setStarredSyncEnabled(false);
+            Preferences.setStarredSyncEnabled(false);
             Objects.requireNonNull(getDialog()).dismiss();
         });
     }
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumListPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumListPageFragment.java
index 23f9aa29..58bd4cd1 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumListPageFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumListPageFragment.java
@@ -6,9 +6,11 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.OptIn;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.media3.common.util.UnstableApi;
 import androidx.navigation.Navigation;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
@@ -21,6 +23,7 @@ import com.cappielloantonio.play.ui.activity.MainActivity;
 import com.cappielloantonio.play.util.MusicUtil;
 import com.cappielloantonio.play.viewmodel.AlbumListPageViewModel;
 
+@OptIn(markerClass = UnstableApi.class)
 public class AlbumListPageFragment extends Fragment implements ClickCallback {
     private FragmentAlbumListPageBinding bind;
 
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java
index b0d8edb7..05843fa7 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java
@@ -128,10 +128,10 @@ public class AlbumPageFragment extends Fragment implements ClickCallback {
             activity.getSupportActionBar().setDisplayShowHomeEnabled(true);
         }
 
-        bind.animToolbar.setTitle(MusicUtil.getReadableString(albumPageViewModel.getAlbum().getTitle()));
+        bind.animToolbar.setTitle(MusicUtil.getReadableString(albumPageViewModel.getAlbum().getName()));
 
-        bind.albumNameLabel.setText(MusicUtil.getReadableString(albumPageViewModel.getAlbum().getTitle()));
-        bind.albumArtistLabel.setText(MusicUtil.getReadableString(albumPageViewModel.getAlbum().getArtistName()));
+        bind.albumNameLabel.setText(MusicUtil.getReadableString(albumPageViewModel.getAlbum().getName()));
+        bind.albumArtistLabel.setText(MusicUtil.getReadableString(albumPageViewModel.getAlbum().getArtist()));
         bind.albumReleaseYearLabel.setText(albumPageViewModel.getAlbum().getYear() != 0 ? String.valueOf(albumPageViewModel.getAlbum().getYear()) : "");
 
         bind.animToolbar.setNavigationOnClickListener(v -> activity.navController.navigateUp());
@@ -174,7 +174,7 @@ public class AlbumPageFragment extends Fragment implements ClickCallback {
 
     private void initBackCover() {
         CustomGlideRequest.Builder
-                .from(requireContext(), albumPageViewModel.getAlbum().getPrimary(), CustomGlideRequest.ALBUM_PIC, null)
+                .from(requireContext(), albumPageViewModel.getAlbum().getCoverArtId(), CustomGlideRequest.ALBUM_PIC, null)
                 .build()
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))
                 .into(bind.albumCoverImageView);
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java
index 931c42f5..dbad7d36 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java
@@ -108,20 +108,20 @@ public class ArtistPageFragment extends Fragment implements ClickCallback {
     }
 
     private void initArtistInfo() {
-        artistPageViewModel.getArtistInfo(artistPageViewModel.getArtist().getId()).observe(getViewLifecycleOwner(), artist -> {
-            String normalizedBio = MusicUtil.forceReadableString(artist.getBio());
+        artistPageViewModel.getArtistInfo(artistPageViewModel.getArtist().getId()).observe(getViewLifecycleOwner(), artistInfo -> {
+            String normalizedBio = MusicUtil.forceReadableString(artistInfo.getBiography());
 
             if (bind != null)
                 bind.artistPageBioSector.setVisibility(!normalizedBio.trim().isEmpty() ? View.VISIBLE : View.GONE);
             if (bind != null)
-                bind.bioMoreTextViewClickable.setVisibility(artist.getLastfm() != null ? View.VISIBLE : View.GONE);
+                bind.bioMoreTextViewClickable.setVisibility(artistInfo.getLastFmUrl() != null ? View.VISIBLE : View.GONE);
 
             if (getContext() != null && bind != null) CustomGlideRequest.Builder
                     .from(
                             requireContext(),
                             artistPageViewModel.getArtist().getId(),
                             CustomGlideRequest.ARTIST_PIC,
-                            artist.getImageUrl()
+                            artistInfo.getLargeImageUrl()
                     )
                     .build()
                     .into(bind.artistBackdropImageView);
@@ -130,7 +130,7 @@ public class ArtistPageFragment extends Fragment implements ClickCallback {
 
             if (bind != null) bind.bioMoreTextViewClickable.setOnClickListener(v -> {
                 Intent intent = new Intent(Intent.ACTION_VIEW);
-                intent.setData(Uri.parse(artist.getLastfm()));
+                intent.setData(Uri.parse(artistInfo.getLastFmUrl()));
                 startActivity(intent);
             });
         });
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/DownloadFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/DownloadFragment.java
index af8caa02..946b576f 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/DownloadFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/DownloadFragment.java
@@ -179,7 +179,8 @@ public class DownloadFragment extends Fragment implements ClickCallback {
                 if (bind != null)
                     bind.downloadedArtistRecyclerView.setLayoutManager(new GridLayoutManager(requireContext(), UIUtil.getSpanCount(artists.size(), 5), GridLayoutManager.HORIZONTAL, false));
 
-                downloadedArtistAdapter.setItems(artists);
+                // TODO
+                // downloadedArtistAdapter.setItems(artists);
             }
         });
 
@@ -214,7 +215,8 @@ public class DownloadFragment extends Fragment implements ClickCallback {
                 if (bind != null)
                     bind.downloadedAlbumRecyclerView.setLayoutManager(new GridLayoutManager(requireContext(), UIUtil.getSpanCount(albums.size(), 5), GridLayoutManager.HORIZONTAL, false));
 
-                downloadedAlbumAdapter.setItems(albums);
+                // TODO
+                //downloadedAlbumAdapter.setItems(albums);
             }
         });
 
@@ -283,7 +285,8 @@ public class DownloadFragment extends Fragment implements ClickCallback {
                 if (bind != null)
                     bind.downloadDownloadedPlaylistSector.setVisibility(!playlists.isEmpty() ? View.VISIBLE : View.GONE);
 
-                playlistHorizontalAdapter.setItems(playlists);
+                // TODO
+                // playlistHorizontalAdapter.setItems(playlists);
             }
         });
     }
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/FilterFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/FilterFragment.java
index e62e603c..1a28e658 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/FilterFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/FilterFragment.java
@@ -8,19 +8,22 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.OptIn;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.media3.common.util.UnstableApi;
 
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.databinding.FragmentFilterBinding;
-import com.cappielloantonio.play.model.Genre;
 import com.cappielloantonio.play.model.Media;
+import com.cappielloantonio.play.subsonic.models.Genre;
 import com.cappielloantonio.play.ui.activity.MainActivity;
 import com.cappielloantonio.play.util.MusicUtil;
 import com.cappielloantonio.play.viewmodel.FilterViewModel;
 import com.google.android.material.chip.Chip;
 
+@OptIn(markerClass = UnstableApi.class)
 public class FilterFragment extends Fragment {
     private static final String TAG = "FilterFragment";
 
@@ -88,13 +91,13 @@ public class FilterFragment extends Fragment {
             bind.filterContainer.setVisibility(View.VISIBLE);
             for (Genre genre : genres) {
                 Chip chip = (Chip) requireActivity().getLayoutInflater().inflate(R.layout.chip_search_filter_genre, null, false);
-                chip.setText(MusicUtil.getReadableString(genre.getName()));
-                chip.setChecked(filterViewModel.getFilters().contains(genre.getId()));
+                chip.setText(MusicUtil.getReadableString(genre.getGenre()));
+                chip.setChecked(filterViewModel.getFilters().contains(genre.getGenre()));
                 chip.setOnCheckedChangeListener((buttonView, isChecked) -> {
                     if (isChecked)
-                        filterViewModel.addFilter(genre.getId(), buttonView.getText().toString());
+                        filterViewModel.addFilter(genre.getGenre(), buttonView.getText().toString());
                     else
-                        filterViewModel.removeFilter(genre.getId(), buttonView.getText().toString());
+                        filterViewModel.removeFilter(genre.getGenre(), buttonView.getText().toString());
                 });
                 bind.filtersChipsGroup.addView(chip);
             }
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/GenreCatalogueFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/GenreCatalogueFragment.java
index d01388a0..545f836c 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/GenreCatalogueFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/GenreCatalogueFragment.java
@@ -16,9 +16,11 @@ import android.widget.SearchView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.OptIn;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.media3.common.util.UnstableApi;
 import androidx.navigation.Navigation;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -32,6 +34,7 @@ import com.cappielloantonio.play.model.Genre;
 import com.cappielloantonio.play.ui.activity.MainActivity;
 import com.cappielloantonio.play.viewmodel.GenreCatalogueViewModel;
 
+@OptIn(markerClass = UnstableApi.class)
 public class GenreCatalogueFragment extends Fragment implements ClickCallback {
     private FragmentGenreCatalogueBinding bind;
     private MainActivity activity;
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java
index 0185d32d..bc1c0648 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java
@@ -45,11 +45,11 @@ import com.cappielloantonio.play.interfaces.ClickCallback;
 import com.cappielloantonio.play.model.Album;
 import com.cappielloantonio.play.model.Artist;
 import com.cappielloantonio.play.model.Media;
-import com.cappielloantonio.play.model.Playlist;
 import com.cappielloantonio.play.service.MediaManager;
 import com.cappielloantonio.play.service.MediaService;
+import com.cappielloantonio.play.subsonic.models.Child;
+import com.cappielloantonio.play.subsonic.models.Playlist;
 import com.cappielloantonio.play.ui.activity.MainActivity;
-import com.cappielloantonio.play.util.MappingUtil;
 import com.cappielloantonio.play.util.MusicUtil;
 import com.cappielloantonio.play.util.UIUtil;
 import com.cappielloantonio.play.viewmodel.HomeViewModel;
@@ -752,7 +752,7 @@ public class HomeFragment extends Fragment implements ClickCallback {
                 });
             }
         } else if (bundle.containsKey("is_chronology")) {
-            List<Media> media = MappingUtil.mapChronology(bundle.getParcelableArrayList("songs_object"));
+            List<Child> media = bundle.getParcelableArrayList("songs_object");
             MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), media, bundle.getInt("position"));
             activity.setBottomSheetInPeek(true);
         } else {
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/LoginFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/LoginFragment.java
index 7b406aed..da3531a8 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/LoginFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/LoginFragment.java
@@ -27,7 +27,7 @@ import com.cappielloantonio.play.model.Server;
 import com.cappielloantonio.play.repository.SystemRepository;
 import com.cappielloantonio.play.ui.activity.MainActivity;
 import com.cappielloantonio.play.ui.dialog.ServerSignupDialog;
-import com.cappielloantonio.play.util.PreferenceUtil;
+import com.cappielloantonio.play.util.Preferences;
 import com.cappielloantonio.play.viewmodel.LoginViewModel;
 
 @UnstableApi
@@ -142,23 +142,23 @@ public class LoginFragment extends Fragment implements ClickCallback {
     }
 
     private void saveServerPreference(String serverId, String server, String user, String password, boolean isLowSecurity) {
-        PreferenceUtil.getInstance(requireContext()).setServerId(serverId);
-        PreferenceUtil.getInstance(requireContext()).setServer(server);
-        PreferenceUtil.getInstance(requireContext()).setUser(user);
-        PreferenceUtil.getInstance(requireContext()).setPassword(password);
-        PreferenceUtil.getInstance(requireContext()).setLowSecurity(isLowSecurity);
+        Preferences.setServerId(serverId);
+        Preferences.setServer(server);
+        Preferences.setUser(user);
+        Preferences.setPassword(password);
+        Preferences.setLowSecurity(isLowSecurity);
 
         App.getSubsonicClientInstance(requireContext(), true);
     }
 
     private void resetServerPreference() {
-        PreferenceUtil.getInstance(requireContext()).setServerId(null);
-        PreferenceUtil.getInstance(requireContext()).setServer(null);
-        PreferenceUtil.getInstance(requireContext()).setUser(null);
-        PreferenceUtil.getInstance(requireContext()).setPassword(null);
-        PreferenceUtil.getInstance(requireContext()).setToken(null);
-        PreferenceUtil.getInstance(requireContext()).setSalt(null);
-        PreferenceUtil.getInstance(requireContext()).setLowSecurity(false);
+        Preferences.setServerId(null);
+        Preferences.setServer(null);
+        Preferences.setUser(null);
+        Preferences.setPassword(null);
+        Preferences.setToken(null);
+        Preferences.setSalt(null);
+        Preferences.setLowSecurity(false);
 
         App.getSubsonicClientInstance(requireContext(), true);
     }
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerControllerFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerControllerFragment.java
index aa66106c..42138cce 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerControllerFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerControllerFragment.java
@@ -2,7 +2,6 @@ package com.cappielloantonio.play.ui.fragment;
 
 import android.content.ComponentName;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -32,7 +31,7 @@ import com.cappielloantonio.play.ui.activity.MainActivity;
 import com.cappielloantonio.play.ui.dialog.RatingDialog;
 import com.cappielloantonio.play.ui.fragment.pager.PlayerControllerHorizontalPager;
 import com.cappielloantonio.play.util.MusicUtil;
-import com.cappielloantonio.play.util.PreferenceUtil;
+import com.cappielloantonio.play.util.Preferences;
 import com.cappielloantonio.play.viewmodel.PlayerBottomSheetViewModel;
 import com.google.android.material.chip.Chip;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -275,37 +274,37 @@ public class PlayerControllerFragment extends Fragment {
 
     private void initPlaybackSpeedButton(MediaBrowser mediaBrowser) {
         playbackSpeedButton.setOnClickListener(view -> {
-            float currentSpeed = PreferenceUtil.getInstance(requireContext()).getPlaybackSpeed();
+            float currentSpeed = Preferences.getPlaybackSpeed();
 
             if (currentSpeed == Media.MEDIA_PLAYBACK_SPEED_080) {
                 mediaBrowser.setPlaybackParameters(new PlaybackParameters(Media.MEDIA_PLAYBACK_SPEED_100));
                 playbackSpeedButton.setText(getString(R.string.player_playback_speed, Media.MEDIA_PLAYBACK_SPEED_100));
-                PreferenceUtil.getInstance(requireContext()).setPlaybackSpeed(Media.MEDIA_PLAYBACK_SPEED_100);
+                Preferences.setPlaybackSpeed(Media.MEDIA_PLAYBACK_SPEED_100);
             } else if (currentSpeed == Media.MEDIA_PLAYBACK_SPEED_100) {
                 mediaBrowser.setPlaybackParameters(new PlaybackParameters(Media.MEDIA_PLAYBACK_SPEED_125));
                 playbackSpeedButton.setText(getString(R.string.player_playback_speed, Media.MEDIA_PLAYBACK_SPEED_125));
-                PreferenceUtil.getInstance(requireContext()).setPlaybackSpeed(Media.MEDIA_PLAYBACK_SPEED_125);
+                Preferences.setPlaybackSpeed(Media.MEDIA_PLAYBACK_SPEED_125);
             } else if (currentSpeed == Media.MEDIA_PLAYBACK_SPEED_125) {
                 mediaBrowser.setPlaybackParameters(new PlaybackParameters(Media.MEDIA_PLAYBACK_SPEED_150));
                 playbackSpeedButton.setText(getString(R.string.player_playback_speed, Media.MEDIA_PLAYBACK_SPEED_150));
-                PreferenceUtil.getInstance(requireContext()).setPlaybackSpeed(Media.MEDIA_PLAYBACK_SPEED_150);
+                Preferences.setPlaybackSpeed(Media.MEDIA_PLAYBACK_SPEED_150);
             } else if (currentSpeed == Media.MEDIA_PLAYBACK_SPEED_150) {
                 mediaBrowser.setPlaybackParameters(new PlaybackParameters(Media.MEDIA_PLAYBACK_SPEED_175));
                 playbackSpeedButton.setText(getString(R.string.player_playback_speed, Media.MEDIA_PLAYBACK_SPEED_175));
-                PreferenceUtil.getInstance(requireContext()).setPlaybackSpeed(Media.MEDIA_PLAYBACK_SPEED_175);
+                Preferences.setPlaybackSpeed(Media.MEDIA_PLAYBACK_SPEED_175);
             } else if (currentSpeed == Media.MEDIA_PLAYBACK_SPEED_175) {
                 mediaBrowser.setPlaybackParameters(new PlaybackParameters(Media.MEDIA_PLAYBACK_SPEED_200));
                 playbackSpeedButton.setText(getString(R.string.player_playback_speed, Media.MEDIA_PLAYBACK_SPEED_200));
-                PreferenceUtil.getInstance(requireContext()).setPlaybackSpeed(Media.MEDIA_PLAYBACK_SPEED_200);
+                Preferences.setPlaybackSpeed(Media.MEDIA_PLAYBACK_SPEED_200);
             } else if (currentSpeed == Media.MEDIA_PLAYBACK_SPEED_200) {
                 mediaBrowser.setPlaybackParameters(new PlaybackParameters(Media.MEDIA_PLAYBACK_SPEED_080));
                 playbackSpeedButton.setText(getString(R.string.player_playback_speed, Media.MEDIA_PLAYBACK_SPEED_080));
-                PreferenceUtil.getInstance(requireContext()).setPlaybackSpeed(Media.MEDIA_PLAYBACK_SPEED_080);
+                Preferences.setPlaybackSpeed(Media.MEDIA_PLAYBACK_SPEED_080);
             }
         });
 
         skipSilenceToggleButton.setOnClickListener(view -> {
-            PreferenceUtil.getInstance(requireContext()).setSkipSilenceMode(!skipSilenceToggleButton.isChecked());
+            Preferences.setSkipSilenceMode(!skipSilenceToggleButton.isChecked());
         });
     }
 
@@ -319,8 +318,8 @@ public class PlayerControllerFragment extends Fragment {
 
     private void setPlaybackParameters(MediaBrowser mediaBrowser) {
         Button playbackSpeedButton = bind.getRoot().findViewById(R.id.player_playback_speed_button);
-        float currentSpeed = PreferenceUtil.getInstance(requireContext()).getPlaybackSpeed();
-        boolean skipSilence = PreferenceUtil.getInstance(requireContext()).isSkipSilenceMode();
+        float currentSpeed = Preferences.getPlaybackSpeed();
+        boolean skipSilence = Preferences.isSkipSilenceMode();
 
         mediaBrowser.setPlaybackParameters(new PlaybackParameters(currentSpeed));
         playbackSpeedButton.setText(getString(R.string.player_playback_speed, currentSpeed));
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerCoverFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerCoverFragment.java
index 8c4ae49e..a83ffe0a 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerCoverFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerCoverFragment.java
@@ -22,7 +22,6 @@ import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.cappielloantonio.play.databinding.InnerFragmentPlayerCoverBinding;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
-import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.service.MediaManager;
 import com.cappielloantonio.play.service.MediaService;
 import com.cappielloantonio.play.ui.dialog.PlaylistChooserDialog;
@@ -32,8 +31,6 @@ import com.cappielloantonio.play.viewmodel.PlayerBottomSheetViewModel;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 
-import java.util.List;
-
 @UnstableApi
 public class PlayerCoverFragment extends Fragment {
     private PlayerBottomSheetViewModel playerBottomSheetViewModel;
@@ -109,7 +106,7 @@ public class PlayerCoverFragment extends Fragment {
 
                 bind.innerButtonBottomLeft.setOnClickListener(view -> {
                     playerBottomSheetViewModel.getMediaInstantMix(getViewLifecycleOwner(), song).observe(getViewLifecycleOwner(), media -> {
-                        MediaManager.enqueue(mediaBrowserListenableFuture, requireContext(), (List<Media>) media, true);
+                        MediaManager.enqueue(mediaBrowserListenableFuture, requireContext(), media, true);
                     });
                 });
 
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerQueueFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerQueueFragment.java
index f74ae1fc..61744c2c 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerQueueFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerQueueFragment.java
@@ -21,11 +21,12 @@ import com.cappielloantonio.play.databinding.InnerFragmentPlayerQueueBinding;
 import com.cappielloantonio.play.interfaces.ClickCallback;
 import com.cappielloantonio.play.service.MediaManager;
 import com.cappielloantonio.play.service.MediaService;
-import com.cappielloantonio.play.util.MappingUtil;
+import com.cappielloantonio.play.subsonic.models.Child;
 import com.cappielloantonio.play.viewmodel.PlayerBottomSheetViewModel;
 import com.google.common.util.concurrent.ListenableFuture;
 
 import java.util.Collections;
+import java.util.stream.Collectors;
 
 @UnstableApi
 public class PlayerQueueFragment extends Fragment implements ClickCallback {
@@ -92,7 +93,7 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
         bind.playerQueueRecyclerView.setAdapter(playerSongQueueAdapter);
         playerBottomSheetViewModel.getQueueSong().observe(getViewLifecycleOwner(), queue -> {
             if (queue != null) {
-                playerSongQueueAdapter.setItems(MappingUtil.mapQueue(queue));
+                playerSongQueueAdapter.setItems(queue.stream().map(item -> (Child) item).collect(Collectors.toList()));
             }
         });
 
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java
index c3d14ab0..ff8b941f 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java
@@ -28,7 +28,7 @@ import com.cappielloantonio.play.adapter.PlaylistHorizontalAdapter;
 import com.cappielloantonio.play.databinding.FragmentPlaylistCatalogueBinding;
 import com.cappielloantonio.play.interfaces.ClickCallback;
 import com.cappielloantonio.play.model.Genre;
-import com.cappielloantonio.play.model.Playlist;
+import com.cappielloantonio.play.subsonic.models.Playlist;
 import com.cappielloantonio.play.ui.activity.MainActivity;
 import com.cappielloantonio.play.ui.dialog.PlaylistEditorDialog;
 import com.cappielloantonio.play.viewmodel.PlaylistCatalogueViewModel;
@@ -72,10 +72,10 @@ public class PlaylistCatalogueFragment extends Fragment implements ClickCallback
     }
 
     private void init() {
-        if (requireArguments().getString(Playlist.ALL) != null) {
-            playlistCatalogueViewModel.setType(Playlist.ALL);
-        } else if (requireArguments().getString(Playlist.DOWNLOADED) != null) {
-            playlistCatalogueViewModel.setType(Playlist.DOWNLOADED);
+        if (requireArguments().getString(com.cappielloantonio.play.model.Playlist.ALL) != null) {
+            playlistCatalogueViewModel.setType(com.cappielloantonio.play.model.Playlist.ALL);
+        } else if (requireArguments().getString(com.cappielloantonio.play.model.Playlist.DOWNLOADED) != null) {
+            playlistCatalogueViewModel.setType(com.cappielloantonio.play.model.Playlist.DOWNLOADED);
         }
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistPageFragment.java
index d43c72ab..c719abc6 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistPageFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistPageFragment.java
@@ -180,28 +180,28 @@ public class PlaylistPageFragment extends Fragment implements ClickCallback {
 
                 // Pic top-left
                 CustomGlideRequest.Builder
-                        .from(requireContext(), songs.size() > 0 ? songs.get(0).getCoverArtId() : playlistPageViewModel.getPlaylist().getPrimary(), CustomGlideRequest.PLAYLIST_PIC, null)
+                        .from(requireContext(), songs.size() > 0 ? songs.get(0).getCoverArtId() : playlistPageViewModel.getPlaylist().getCoverArtId(), CustomGlideRequest.PLAYLIST_PIC, null)
                         .build()
                         .transform(new CenterCrop(), new GranularRoundedCorners(CustomGlideRequest.CORNER_RADIUS, 0, 0, 0))
                         .into(bind.playlistCoverImageViewTopLeft);
 
                 // Pic top-right
                 CustomGlideRequest.Builder
-                        .from(requireContext(), songs.size() > 1 ? songs.get(1).getCoverArtId() : playlistPageViewModel.getPlaylist().getPrimary(), CustomGlideRequest.PLAYLIST_PIC, null)
+                        .from(requireContext(), songs.size() > 1 ? songs.get(1).getCoverArtId() : playlistPageViewModel.getPlaylist().getCoverArtId(), CustomGlideRequest.PLAYLIST_PIC, null)
                         .build()
                         .transform(new CenterCrop(), new GranularRoundedCorners(0, CustomGlideRequest.CORNER_RADIUS, 0, 0))
                         .into(bind.playlistCoverImageViewTopRight);
 
                 // Pic bottom-left
                 CustomGlideRequest.Builder
-                        .from(requireContext(), songs.size() > 2 ? songs.get(2).getCoverArtId() : playlistPageViewModel.getPlaylist().getPrimary(), CustomGlideRequest.PLAYLIST_PIC, null)
+                        .from(requireContext(), songs.size() > 2 ? songs.get(2).getCoverArtId() : playlistPageViewModel.getPlaylist().getCoverArtId(), CustomGlideRequest.PLAYLIST_PIC, null)
                         .build()
                         .transform(new CenterCrop(), new GranularRoundedCorners(0, 0, 0, CustomGlideRequest.CORNER_RADIUS))
                         .into(bind.playlistCoverImageViewBottomLeft);
 
                 // Pic bottom-right
                 CustomGlideRequest.Builder
-                        .from(requireContext(), songs.size() > 3 ? songs.get(3).getCoverArtId() : playlistPageViewModel.getPlaylist().getPrimary(), CustomGlideRequest.PLAYLIST_PIC, null)
+                        .from(requireContext(), songs.size() > 3 ? songs.get(3).getCoverArtId() : playlistPageViewModel.getPlaylist().getCoverArtId(), CustomGlideRequest.PLAYLIST_PIC, null)
                         .build()
                         .transform(new CenterCrop(), new GranularRoundedCorners(0, 0, CustomGlideRequest.CORNER_RADIUS, 0))
                         .into(bind.playlistCoverImageViewBottomRight);
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java
index c01c992f..a85e4d19 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java
@@ -177,22 +177,17 @@ public class SearchFragment extends Fragment implements ClickCallback {
     }
 
     private void performSearch(String query) {
-        searchViewModel.searchArtist(query).observe(getViewLifecycleOwner(), artists -> {
-            if (bind != null)
-                bind.searchArtistSector.setVisibility(!artists.isEmpty() ? View.VISIBLE : View.GONE);
-            artistAdapter.setItems(artists);
-        });
+        searchViewModel.search(query).observe(getViewLifecycleOwner(), result -> {
+            if (bind != null) {
+                bind.searchArtistSector.setVisibility(!result.getArtists().isEmpty() ? View.VISIBLE : View.GONE);
+                artistAdapter.setItems(result.getArtists());
 
-        searchViewModel.searchAlbum(query).observe(getViewLifecycleOwner(), albums -> {
-            if (bind != null)
-                bind.searchAlbumSector.setVisibility(!albums.isEmpty() ? View.VISIBLE : View.GONE);
-            albumAdapter.setItems(albums);
-        });
+                bind.searchAlbumSector.setVisibility(!result.getAlbums().isEmpty() ? View.VISIBLE : View.GONE);
+                albumAdapter.setItems(result.getAlbums());
 
-        searchViewModel.searchSong(query).observe(getViewLifecycleOwner(), songs -> {
-            if (bind != null)
-                bind.searchSongSector.setVisibility(!songs.isEmpty() ? View.VISIBLE : View.GONE);
-            songHorizontalAdapter.setItems(songs);
+                bind.searchSongSector.setVisibility(!result.getSongs().isEmpty() ? View.VISIBLE : View.GONE);
+                songHorizontalAdapter.setItems(result.getSongs());
+            }
         });
 
         bind.searchResultLayout.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java
index 7bf7cd23..cc924803 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java
@@ -3,7 +3,6 @@ package com.cappielloantonio.play.ui.fragment;
 import android.content.Intent;
 import android.media.audiofx.AudioEffect;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -12,7 +11,9 @@ import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.OptIn;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.media3.common.util.UnstableApi;
 import androidx.preference.ListPreference;
 import androidx.preference.PreferenceFragmentCompat;
 
@@ -21,9 +22,10 @@ import com.cappielloantonio.play.helper.ThemeHelper;
 import com.cappielloantonio.play.interfaces.ScanCallback;
 import com.cappielloantonio.play.ui.activity.MainActivity;
 import com.cappielloantonio.play.ui.dialog.StarredSyncDialog;
-import com.cappielloantonio.play.util.PreferenceUtil;
+import com.cappielloantonio.play.util.Preferences;
 import com.cappielloantonio.play.viewmodel.SettingViewModel;
 
+@OptIn(markerClass = UnstableApi.class)
 public class SettingsFragment extends PreferenceFragmentCompat {
     private static final String TAG = "SettingsFragment";
 
@@ -81,7 +83,8 @@ public class SettingsFragment extends PreferenceFragmentCompat {
                 @Override
                 public void onSuccess(boolean isScanning, long count) {
                     if (isScanning) getScanStatus();
-                    else findPreference("scan_library").setSummary("Scanning: counting " + count + " tracks");
+                    else
+                        findPreference("scan_library").setSummary("Scanning: counting " + count + " tracks");
                 }
             });
 
@@ -108,7 +111,7 @@ public class SettingsFragment extends PreferenceFragmentCompat {
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         setPreferencesFromResource(R.xml.global_preferences, rootKey);
-        ListPreference themePreference = findPreference(PreferenceUtil.THEME);
+        ListPreference themePreference = findPreference(Preferences.THEME);
         if (themePreference != null) {
             themePreference.setOnPreferenceChangeListener(
                     (preference, newValue) -> {
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SongListPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SongListPageFragment.java
index 96079bc4..c4b05c25 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SongListPageFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SongListPageFragment.java
@@ -90,8 +90,8 @@ public class SongListPageFragment extends Fragment implements ClickCallback {
         } else if (requireArguments().getString(Media.BY_GENRE) != null) {
             songListPageViewModel.title = Media.BY_GENRE;
             songListPageViewModel.genre = requireArguments().getParcelable("genre_object");
-            songListPageViewModel.toolbarTitle = MusicUtil.getReadableString(songListPageViewModel.genre.getName());
-            bind.pageTitleLabel.setText(MusicUtil.getReadableString(songListPageViewModel.genre.getName()));
+            songListPageViewModel.toolbarTitle = MusicUtil.getReadableString(songListPageViewModel.genre.getGenre());
+            bind.pageTitleLabel.setText(MusicUtil.getReadableString(songListPageViewModel.genre.getGenre()));
         } else if (requireArguments().getString(Media.BY_ARTIST) != null) {
             songListPageViewModel.title = Media.BY_ARTIST;
             songListPageViewModel.artist = requireArguments().getParcelable("artist_object");
@@ -119,8 +119,8 @@ public class SongListPageFragment extends Fragment implements ClickCallback {
         } else if (requireArguments().getParcelable("album_object") != null) {
             songListPageViewModel.album = requireArguments().getParcelable("album_object");
             songListPageViewModel.title = Media.FROM_ALBUM;
-            songListPageViewModel.toolbarTitle = MusicUtil.getReadableString(songListPageViewModel.album.getTitle());
-            bind.pageTitleLabel.setText(MusicUtil.getReadableString(songListPageViewModel.album.getTitle()));
+            songListPageViewModel.toolbarTitle = MusicUtil.getReadableString(songListPageViewModel.album.getName());
+            bind.pageTitleLabel.setText(MusicUtil.getReadableString(songListPageViewModel.album.getName()));
         }
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java
index 9395087a..aa1f64c1 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java
@@ -24,12 +24,12 @@ import com.cappielloantonio.play.App;
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
 import com.cappielloantonio.play.interfaces.MediaCallback;
-import com.cappielloantonio.play.model.Album;
 import com.cappielloantonio.play.model.Download;
-import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.repository.AlbumRepository;
 import com.cappielloantonio.play.service.MediaManager;
 import com.cappielloantonio.play.service.MediaService;
+import com.cappielloantonio.play.subsonic.models.AlbumID3;
+import com.cappielloantonio.play.subsonic.models.Child;
 import com.cappielloantonio.play.ui.activity.MainActivity;
 import com.cappielloantonio.play.util.DownloadUtil;
 import com.cappielloantonio.play.util.MappingUtil;
@@ -45,7 +45,7 @@ import java.util.List;
 @UnstableApi
 public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements View.OnClickListener {
     private AlbumBottomSheetViewModel albumBottomSheetViewModel;
-    private Album album;
+    private AlbumID3 album;
 
     private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
 
@@ -80,17 +80,17 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
     private void init(View view) {
         ImageView coverAlbum = view.findViewById(R.id.album_cover_image_view);
         CustomGlideRequest.Builder
-                .from(requireContext(), albumBottomSheetViewModel.getAlbum().getPrimary(), CustomGlideRequest.ALBUM_PIC, null)
+                .from(requireContext(), albumBottomSheetViewModel.getAlbum().getCoverArtId(), CustomGlideRequest.ALBUM_PIC, null)
                 .build()
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))
                 .into(coverAlbum);
 
         TextView titleAlbum = view.findViewById(R.id.album_title_text_view);
-        titleAlbum.setText(MusicUtil.getReadableString(albumBottomSheetViewModel.getAlbum().getTitle()));
+        titleAlbum.setText(MusicUtil.getReadableString(albumBottomSheetViewModel.getAlbum().getName()));
         titleAlbum.setSelected(true);
 
         TextView artistAlbum = view.findViewById(R.id.album_artist_text_view);
-        artistAlbum.setText(MusicUtil.getReadableString(albumBottomSheetViewModel.getAlbum().getArtistName()));
+        artistAlbum.setText(MusicUtil.getReadableString(albumBottomSheetViewModel.getAlbum().getArtist()));
 
         ToggleButton favoriteToggle = view.findViewById(R.id.button_favorite);
         favoriteToggle.setChecked(Boolean.TRUE.equals(albumBottomSheetViewModel.getAlbum().getStarred()));
@@ -111,7 +111,7 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
                 @Override
                 public void onLoadMedia(List<?> media) {
                     if (media.size() > 0) {
-                        MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), (ArrayList<Media>) media, 0);
+                        MediaManager.startQueue(mediaBrowserListenableFuture, requireContext(), (ArrayList<Child>) media, 0);
                         ((MainActivity) requireActivity()).setBottomSheetInPeek(true);
                     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java
index c50c0f20..b8d18199 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java
@@ -2,7 +2,6 @@ package com.cappielloantonio.play.ui.fragment.bottomsheetdialog;
 
 import android.content.ComponentName;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -22,27 +21,22 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.cappielloantonio.play.App;
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
-import com.cappielloantonio.play.interfaces.MediaCallback;
-import com.cappielloantonio.play.model.Artist;
-import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.repository.ArtistRepository;
 import com.cappielloantonio.play.service.MediaManager;
 import com.cappielloantonio.play.service.MediaService;
+import com.cappielloantonio.play.subsonic.models.ArtistID3;
 import com.cappielloantonio.play.ui.activity.MainActivity;
 import com.cappielloantonio.play.util.MusicUtil;
 import com.cappielloantonio.play.viewmodel.ArtistBottomSheetViewModel;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import com.google.common.util.concurrent.ListenableFuture;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @UnstableApi
 public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implements View.OnClickListener {
     private static final String TAG = "AlbumBottomSheetDialog";
 
     private ArtistBottomSheetViewModel artistBottomSheetViewModel;
-    private Artist artist;
+    private ArtistID3 artist;
 
     private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
 
@@ -78,7 +72,7 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement
     private void init(View view) {
         ImageView coverArtist = view.findViewById(R.id.artist_cover_image_view);
         CustomGlideRequest.Builder
-                .from(requireContext(), artistBottomSheetViewModel.getArtist().getPrimary(), CustomGlideRequest.ARTIST_PIC, null)
+                .from(requireContext(), artistBottomSheetViewModel.getArtist().getCoverArtId(), CustomGlideRequest.ARTIST_PIC, null)
                 .build()
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))
                 .into(coverArtist);
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/PodcastBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/PodcastBottomSheetDialog.java
index 89dbb368..d30b227a 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/PodcastBottomSheetDialog.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/PodcastBottomSheetDialog.java
@@ -19,12 +19,9 @@ import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
-import com.cappielloantonio.play.model.Media;
-import com.cappielloantonio.play.service.MediaManager;
 import com.cappielloantonio.play.service.MediaService;
+import com.cappielloantonio.play.subsonic.models.PodcastEpisode;
 import com.cappielloantonio.play.ui.activity.MainActivity;
-import com.cappielloantonio.play.util.DownloadUtil;
-import com.cappielloantonio.play.util.MappingUtil;
 import com.cappielloantonio.play.util.MusicUtil;
 import com.cappielloantonio.play.viewmodel.PodcastBottomSheetViewModel;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
@@ -33,7 +30,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 @UnstableApi
 public class PodcastBottomSheetDialog extends BottomSheetDialogFragment implements View.OnClickListener {
     private PodcastBottomSheetViewModel podcastBottomSheetViewModel;
-    private Media podcast;
+    private PodcastEpisode podcast;
 
     private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
 
@@ -67,6 +64,7 @@ public class PodcastBottomSheetDialog extends BottomSheetDialogFragment implemen
 
     private void init(View view) {
         ImageView coverPodcast = view.findViewById(R.id.podcast_cover_image_view);
+
         CustomGlideRequest.Builder
                 .from(requireContext(), podcastBottomSheetViewModel.getPodcast().getCoverArtId(), CustomGlideRequest.SONG_PIC, null)
                 .build()
@@ -79,37 +77,41 @@ public class PodcastBottomSheetDialog extends BottomSheetDialogFragment implemen
         titlePodcast.setSelected(true);
 
         TextView channel = view.findViewById(R.id.podcast_artist_text_view);
-        channel.setText(MusicUtil.getReadableString(podcastBottomSheetViewModel.getPodcast().getArtistName()));
+        channel.setText(MusicUtil.getReadableString(podcastBottomSheetViewModel.getPodcast().getArtist()));
 
         TextView playNext = view.findViewById(R.id.play_next_text_view);
         playNext.setOnClickListener(v -> {
-            MediaManager.enqueue(mediaBrowserListenableFuture, requireContext(), podcast, true);
+            // TODO
+            // MediaManager.enqueue(mediaBrowserListenableFuture, requireContext(), podcast, true);
             ((MainActivity) requireActivity()).setBottomSheetInPeek(true);
             dismissBottomSheet();
         });
 
         TextView addToQueue = view.findViewById(R.id.add_to_queue_text_view);
         addToQueue.setOnClickListener(v -> {
-            MediaManager.enqueue(mediaBrowserListenableFuture, requireContext(), podcast, false);
+            // TODO
+            // MediaManager.enqueue(mediaBrowserListenableFuture, requireContext(), podcast, false);
             ((MainActivity) requireActivity()).setBottomSheetInPeek(true);
             dismissBottomSheet();
         });
 
         TextView download = view.findViewById(R.id.download_text_view);
         download.setOnClickListener(v -> {
-            DownloadUtil.getDownloadTracker(requireContext()).download(
+            // TODO
+            /* DownloadUtil.getDownloadTracker(requireContext()).download(
                     MappingUtil.mapMediaItem(requireContext(), podcast, false),
                     MappingUtil.mapDownload(podcast, null, null)
-            );
+            ); */
             dismissBottomSheet();
         });
 
         TextView remove = view.findViewById(R.id.remove_text_view);
         remove.setOnClickListener(v -> {
-            DownloadUtil.getDownloadTracker(requireContext()).remove(
+            // TODO
+            /* DownloadUtil.getDownloadTracker(requireContext()).remove(
                     MappingUtil.mapMediaItem(requireContext(), podcast, false),
                     MappingUtil.mapDownload(podcast, null, null)
-            );
+            ); */
             dismissBottomSheet();
         });
 
@@ -132,13 +134,14 @@ public class PodcastBottomSheetDialog extends BottomSheetDialogFragment implemen
     }
 
     private void initDownloadUI(TextView download, TextView remove) {
-        if (DownloadUtil.getDownloadTracker(requireContext()).isDownloaded(MappingUtil.mapMediaItem(requireContext(), podcast, false))) {
+        // TODO
+        /* if (DownloadUtil.getDownloadTracker(requireContext()).isDownloaded(MappingUtil.mapMediaItem(requireContext(), podcast, false))) {
             download.setVisibility(View.GONE);
             remove.setVisibility(View.VISIBLE);
         } else {
             download.setVisibility(View.VISIBLE);
             remove.setVisibility(View.GONE);
-        }
+        } */
     }
 
     private void initializeMediaBrowser() {
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java
index 7c9814b2..aa01f6fc 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java
@@ -21,9 +21,9 @@ import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.glide.CustomGlideRequest;
-import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.service.MediaManager;
 import com.cappielloantonio.play.service.MediaService;
+import com.cappielloantonio.play.subsonic.models.Child;
 import com.cappielloantonio.play.ui.activity.MainActivity;
 import com.cappielloantonio.play.ui.dialog.PlaylistChooserDialog;
 import com.cappielloantonio.play.ui.dialog.RatingDialog;
@@ -41,7 +41,7 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
     private static final String TAG = "SongBottomSheetDialog";
 
     private SongBottomSheetViewModel songBottomSheetViewModel;
-    private Media song;
+    private Child song;
 
     private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
 
@@ -87,7 +87,7 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
         titleSong.setSelected(true);
 
         TextView artistSong = view.findViewById(R.id.song_artist_text_view);
-        artistSong.setText(MusicUtil.getReadableString(songBottomSheetViewModel.getSong().getArtistName()));
+        artistSong.setText(MusicUtil.getReadableString(songBottomSheetViewModel.getSong().getArtist()));
 
         ToggleButton favoriteToggle = view.findViewById(R.id.button_favorite);
         favoriteToggle.setChecked(Boolean.TRUE.equals(songBottomSheetViewModel.getSong().getStarred()));
@@ -119,7 +119,7 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
                 }
 
                 if (songs.size() > 0) {
-                    MediaManager.enqueue(mediaBrowserListenableFuture, requireContext(), (List<Media>) songs, true);
+                    MediaManager.enqueue(mediaBrowserListenableFuture, requireContext(), (List<Child>) songs, true);
                     dismissBottomSheet();
                 }
             });
diff --git a/app/src/main/java/com/cappielloantonio/play/util/Constants.kt b/app/src/main/java/com/cappielloantonio/play/util/Constants.kt
new file mode 100644
index 00000000..92a558d7
--- /dev/null
+++ b/app/src/main/java/com/cappielloantonio/play/util/Constants.kt
@@ -0,0 +1,5 @@
+package com.cappielloantonio.play.util
+
+object Constants {
+    const val SHARED_PREF_KEY = "play-shared-preferences"
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/util/MappingUtil.java b/app/src/main/java/com/cappielloantonio/play/util/MappingUtil.java
index 631d4c33..b0cd81de 100644
--- a/app/src/main/java/com/cappielloantonio/play/util/MappingUtil.java
+++ b/app/src/main/java/com/cappielloantonio/play/util/MappingUtil.java
@@ -12,142 +12,25 @@ import androidx.media3.common.util.UnstableApi;
 
 import com.cappielloantonio.play.model.Album;
 import com.cappielloantonio.play.model.Artist;
-import com.cappielloantonio.play.model.Chronology;
 import com.cappielloantonio.play.model.Download;
 import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.model.Playlist;
-import com.cappielloantonio.play.model.PodcastChannel;
-import com.cappielloantonio.play.model.Queue;
-import com.cappielloantonio.play.subsonic.models.AlbumID3;
-import com.cappielloantonio.play.subsonic.models.AlbumInfo;
-import com.cappielloantonio.play.subsonic.models.AlbumWithSongsID3;
-import com.cappielloantonio.play.subsonic.models.ArtistID3;
-import com.cappielloantonio.play.subsonic.models.ArtistInfo2;
-import com.cappielloantonio.play.subsonic.models.ArtistWithAlbumsID3;
 import com.cappielloantonio.play.subsonic.models.Child;
-import com.cappielloantonio.play.subsonic.models.Genre;
-import com.cappielloantonio.play.subsonic.models.SimilarArtistID3;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class MappingUtil {
-    public static ArrayList<Media> mapSong(List<Child> children) {
-        ArrayList<Media> songs = new ArrayList();
-
-        for (Child child : children) {
-            songs.add(new Media(child));
-        }
-
-        return songs;
-    }
-
-    public static Media mapSong(Child child) {
-        return new Media(child);
-    }
-
-    public static ArrayList<Album> mapAlbum(List<AlbumID3> albumID3List) {
-        ArrayList<Album> albums = new ArrayList();
-
-        for (AlbumID3 albumID3 : albumID3List) {
-            albums.add(new Album(albumID3));
-        }
-
-        return albums;
-    }
-
-    public static Album mapAlbum(AlbumWithSongsID3 albumWithSongsID3) {
-        return new Album(albumWithSongsID3);
-    }
-
-    public static ArrayList<Artist> mapArtist(List<ArtistID3> artistID3List) {
-        ArrayList<Artist> artists = new ArrayList();
-
-        for (ArtistID3 artistID3 : artistID3List) {
-            artists.add(new Artist(artistID3));
-        }
-
-        return artists;
-    }
-
-    public static Artist mapArtist(ArtistInfo2 artistInfo2) {
-        return new Artist(artistInfo2);
-    }
-
-    public static Artist mapArtist(ArtistWithAlbumsID3 artistWithAlbumsID3) {
-        return new Artist(artistWithAlbumsID3);
-    }
-
-    public static Artist mapArtistWithAlbum(ArtistWithAlbumsID3 artistWithAlbumsID3) {
-        return new Artist(artistWithAlbumsID3);
-    }
-
-    public static ArrayList<Artist> mapSimilarArtist(List<SimilarArtistID3> similarArtistID3s) {
-        ArrayList<Artist> artists = new ArrayList();
-
-        for (SimilarArtistID3 similarArtistID3 : similarArtistID3s) {
-            artists.add(new Artist(similarArtistID3));
-        }
-
-        return artists;
-    }
-
-    public static ArrayList<Media> mapQueue(List<Queue> queueList) {
-        ArrayList<Media> media = new ArrayList();
-
-        for (Queue item : queueList) {
-            media.add(new Media(item));
-        }
-
-        return media;
-    }
-
-    public static Queue mapMediaToQueue(Media media, int trackOrder) {
-        return new Queue(trackOrder, media.getId(), media.getTitle(), media.getAlbumId(), media.getAlbumName(), media.getArtistId(), media.getArtistName(), media.getCoverArtId(), media.getDuration(), 0, 0, media.getStreamId(), media.getChannelId(), media.getPublishDate(), media.getContainer(), media.getBitrate(), media.getExtension(), media.getType());
-    }
-
-    public static List<Queue> mapMediaToQueue(List<Media> media) {
-        List<Queue> queue = new ArrayList<>();
-
-        for (int counter = 0; counter < media.size(); counter++) {
-            queue.add(mapMediaToQueue(media.get(counter), counter));
-        }
-
-        return queue;
-    }
-
-    public static ArrayList<Playlist> mapPlaylist(List<com.cappielloantonio.play.subsonic.models.Playlist> playlists) {
-        ArrayList<Playlist> playlist = new ArrayList();
-
-        for (com.cappielloantonio.play.subsonic.models.Playlist item : playlists) {
-            playlist.add(new Playlist(item));
-        }
-
-        return playlist;
-    }
-
-    public static ArrayList<Media> mapDownloadToMedia(List<Download> downloads) {
-        ArrayList<Media> media = new ArrayList();
-
-        for (Download download : downloads) {
-            Media item = new Media(download);
-            if (!media.contains(item)) {
-                media.add(item);
-            }
-        }
-
-        return media;
-    }
-
     public static ArrayList<Album> mapDownloadToAlbum(List<Download> downloads) {
         ArrayList<Album> albums = new ArrayList();
 
-        for (Download download : downloads) {
+        // TODO
+        /* for (Download download : downloads) {
             Album album = new Album(download);
             if (!albums.contains(album)) {
                 albums.add(album);
             }
-        }
+        } */
 
         return albums;
     }
@@ -155,12 +38,13 @@ public class MappingUtil {
     public static ArrayList<Artist> mapDownloadToArtist(List<Download> downloads) {
         ArrayList<Artist> artists = new ArrayList();
 
-        for (Download download : downloads) {
+        // TODO
+        /* for (Download download : downloads) {
             Artist artist = new Artist(download);
             if (!artists.contains(artist)) {
                 artists.add(artist);
             }
-        }
+        } */
 
         return artists;
     }
@@ -168,63 +52,53 @@ public class MappingUtil {
     public static ArrayList<Playlist> mapDownloadToPlaylist(List<Download> downloads) {
         ArrayList<Playlist> playlists = new ArrayList();
 
-        for (Download download : downloads) {
+        // TODO
+        /*for (Download download : downloads) {
             playlists.add(new Playlist(download.getPlaylistId(), download.getPlaylistName(), null, 0, 0, null));
-        }
+        }*/
 
         return playlists;
     }
 
-    public static ArrayList<Download> mapDownload(List<Media> media, String playlistId, String playlistName) {
+    public static ArrayList<Download> mapDownload(List<Child> media, String playlistId, String playlistName) {
         ArrayList<Download> downloads = new ArrayList();
 
-        for (Media item : media) {
-            downloads.add(new Download(item, playlistId, playlistName));
-        }
+        // TODO
+        /* for (Child item : media) {
+            Download download = (Download) item;
+            download.setMediaID();
+            download.setServer();
+            download.setPlaylistId();
+            downloads.add(download);
+        } */
 
         return downloads;
     }
 
-    public static Download mapDownload(Media media, String playlistId, String playlistName) {
-        return new Download(media, playlistId, playlistName);
-    }
+    public static Download mapDownload(Child media, String playlistId, String playlistName) {
+        // TODO
+        //return new Download(media, playlistId, playlistName);
 
-    public static ArrayList<com.cappielloantonio.play.model.Genre> mapGenre(List<Genre> genreList) {
-        ArrayList<com.cappielloantonio.play.model.Genre> genres = new ArrayList();
-
-        for (Genre genre : genreList) {
-            genres.add(new com.cappielloantonio.play.model.Genre(genre));
-        }
-
-        return genres;
+        return null;
     }
 
     @OptIn(markerClass = UnstableApi.class)
-    public static MediaItem mapMediaItem(Context context, Media media, boolean stream) {
+    public static MediaItem mapMediaItem(Context context, Child media, boolean stream) {
         boolean isDownloaded = DownloadUtil.getDownloadTracker(context).isDownloaded(MusicUtil.getDownloadUri(media.getId()));
 
         Bundle bundle = new Bundle();
-        bundle.putString("id", media.getId());
-        bundle.putString("albumId", media.getAlbumId());
-        bundle.putString("artistId", media.getArtistId());
-        bundle.putString("coverArtId", media.getCoverArtId());
-        bundle.putString("mediaType", media.getType());
-        bundle.putLong("duration", media.getDuration());
-        bundle.putString("container", media.getContainer());
-        bundle.putInt("bitrate", media.getBitrate());
-        bundle.putString("extension", media.getExtension());
-        bundle.putString("server", PreferenceUtil.getInstance(context).getServerId());
+        bundle.putParcelable("child", media);
 
         return new MediaItem.Builder()
                 .setMediaId(media.getId())
                 .setMediaMetadata(
                         new MediaMetadata.Builder()
                                 .setTitle(MusicUtil.getReadableString(media.getTitle()))
-                                .setTrackNumber(media.getTrackNumber())
+                                .setTrackNumber(media.getTrack())
                                 .setDiscNumber(media.getDiscNumber())
                                 .setReleaseYear(media.getYear())
-                                .setAlbumTitle(MusicUtil.getReadableString(media.getAlbumName()))
-                                .setArtist(MusicUtil.getReadableString(media.getArtistName()))
+                                .setAlbumTitle(MusicUtil.getReadableString(media.getAlbum()))
+                                .setArtist(MusicUtil.getReadableString(media.getArtist()))
                                 .setExtras(bundle)
                                 .build()
                 )
@@ -239,7 +113,7 @@ public class MappingUtil {
                 .build();
     }
 
-    private static Uri getUri(Context context, Media media, boolean stream) {
+    private static Uri getUri(Context context, Child media, boolean stream) {
         switch (media.getType()) {
             case Media.MEDIA_TYPE_MUSIC:
                 if (stream) {
@@ -249,16 +123,18 @@ public class MappingUtil {
                 }
             case Media.MEDIA_TYPE_PODCAST:
                 if (stream) {
-                    return MusicUtil.getStreamUri(context, media.getStreamId());
+                    // TODO
+                    // return MusicUtil.getStreamUri(context, media.getStreamId());
                 } else {
-                    return MusicUtil.getDownloadUri(media.getStreamId());
+                    // TODO
+                    // return MusicUtil.getDownloadUri(media.getStreamId());
                 }
             default:
                 return MusicUtil.getStreamUri(context, media.getId());
         }
     }
 
-    public static ArrayList<MediaItem> mapMediaItems(Context context, List<Media> items, boolean stream) {
+    public static ArrayList<MediaItem> mapMediaItems(Context context, List<Child> items, boolean stream) {
         ArrayList<MediaItem> mediaItems = new ArrayList();
 
         for (int i = 0; i < items.size(); i++) {
@@ -267,63 +143,4 @@ public class MappingUtil {
 
         return mediaItems;
     }
-
-    public static Chronology mapChronology(MediaItem item) {
-        return new Chronology(
-                item.mediaId,
-                item.mediaMetadata.title.toString(),
-                item.mediaMetadata.extras.get("albumId").toString(),
-                item.mediaMetadata.albumTitle.toString(),
-                item.mediaMetadata.extras.get("artistId").toString(),
-                item.mediaMetadata.artist.toString(),
-                item.mediaMetadata.extras.get("coverArtId").toString(),
-                (long) item.mediaMetadata.extras.get("duration"),
-                item.mediaMetadata.extras.get("container").toString(),
-                (int) item.mediaMetadata.extras.get("bitrate"),
-                item.mediaMetadata.extras.get("extension").toString(),
-                item.mediaMetadata.extras.get("server").toString()
-        );
-    }
-
-    public static ArrayList<Media> mapChronology(List<Chronology> items) {
-        ArrayList<Media> songs = new ArrayList();
-
-        for (Chronology item : items) {
-            songs.add(mapSong(item));
-        }
-
-        return songs;
-    }
-
-    public static Media mapSong(Chronology item) {
-        return new Media(item);
-    }
-
-    public static ArrayList<PodcastChannel> mapPodcastChannel(List<com.cappielloantonio.play.subsonic.models.PodcastChannel> subsonicPodcastChannels) {
-        ArrayList<PodcastChannel> podcastChannels = new ArrayList();
-
-        for (com.cappielloantonio.play.subsonic.models.PodcastChannel subsonicPodcastChannel : subsonicPodcastChannels) {
-            podcastChannels.add(mapPodcastChannel(subsonicPodcastChannel));
-        }
-
-        return podcastChannels;
-    }
-
-    public static PodcastChannel mapPodcastChannel(com.cappielloantonio.play.subsonic.models.PodcastChannel subsonicPodcastChannel) {
-        return new PodcastChannel(subsonicPodcastChannel);
-    }
-
-    public static ArrayList<Media> mapPodcastEpisode(List<com.cappielloantonio.play.subsonic.models.PodcastEpisode> subsonicPodcastEpisodes) {
-        ArrayList<Media> podcastEpisodes = new ArrayList();
-
-        for (com.cappielloantonio.play.subsonic.models.PodcastEpisode subsonicPodcastEpisode : subsonicPodcastEpisodes) {
-            podcastEpisodes.add(mapPodcastEpisode(subsonicPodcastEpisode));
-        }
-
-        return podcastEpisodes;
-    }
-
-    public static Media mapPodcastEpisode(com.cappielloantonio.play.subsonic.models.PodcastEpisode subsonicPodcastEpisode) {
-        return new Media(subsonicPodcastEpisode);
-    }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java b/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java
index 2e04172a..cb6d2052 100644
--- a/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java
+++ b/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java
@@ -201,11 +201,11 @@ public class MusicUtil {
             return "0";
 
         if (networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
-            return PreferenceUtil.getInstance(context).getMaxBitrateWifi();
+            return Preferences.getMaxBitrateWifi();
         } else if (networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) {
-            return PreferenceUtil.getInstance(context).getMaxBitrateMobile();
+            return Preferences.getMaxBitrateMobile();
         } else {
-            return PreferenceUtil.getInstance(context).getMaxBitrateWifi();
+            return Preferences.getMaxBitrateWifi();
         }
     }
 
@@ -216,11 +216,11 @@ public class MusicUtil {
         if (network == null || networkCapabilities == null) return "raw";
 
         if (networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
-            return PreferenceUtil.getInstance(context).getAudioTranscodeFormatWifi();
+            return Preferences.getAudioTranscodeFormatWifi();
         } else if (networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) {
-            return PreferenceUtil.getInstance(context).getAudioTranscodeFormatMobile();
+            return Preferences.getAudioTranscodeFormatMobile();
         } else {
-            return PreferenceUtil.getInstance(context).getAudioTranscodeFormatWifi();
+            return Preferences.getAudioTranscodeFormatWifi();
         }
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/util/PreferenceUtil.java b/app/src/main/java/com/cappielloantonio/play/util/PreferenceUtil.java
deleted file mode 100644
index b983f835..00000000
--- a/app/src/main/java/com/cappielloantonio/play/util/PreferenceUtil.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package com.cappielloantonio.play.util;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import androidx.preference.PreferenceManager;
-
-import com.cappielloantonio.play.helper.ThemeHelper;
-
-public class PreferenceUtil {
-    private static final String TAG = "PreferenceUtil";
-
-    public static final String SERVER = "server";
-    public static final String THEME = "theme";
-    public static final String USER = "user";
-    public static final String PASSWORD = "password";
-    public static final String TOKEN = "token";
-    public static final String SALT = "salt";
-    public static final String LOW_SECURITY = "low_security";
-    public static final String SERVER_ID = "server_id";
-    public static final String PLAYBACK_SPEED = "playback_speed";
-    public static final String SKIP_SILENCE = "skip_silence";
-    public static final String IMAGE_CACHE_SIZE = "image_cache_size";
-    public static final String IMAGE_SIZE = "image_size";
-    public static final String MEDIA_CACHE_SIZE = "media_cache_size";
-    public static final String MAX_BITRATE_WIFI = "max_bitrate_wifi";
-    public static final String MAX_BITRATE_MOBILE = "max_bitrate_mobile";
-    public static final String AUDIO_TRANSCODE_FORMAT_WIFI = "audio_transcode_format_wifi";
-    public static final String AUDIO_TRANSCODE_FORMAT_MOBILE = "audio_transcode_format_mobile";
-    public static final String WIFI_ONLY = "wifi_only";
-    public static final String DATA_SAVING_MODE = "data_saving_mode";
-    public static final String SYNC_STARRED_TRACKS_FOR_OFFLINE_USE = "sync_starred_tracks_for_offline_use";
-
-    private static PreferenceUtil sInstance;
-    private final SharedPreferences mPreferences;
-
-    private PreferenceUtil(final Context context) {
-        mPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-    }
-
-    public static PreferenceUtil getInstance(final Context context) {
-        if (sInstance == null) {
-            sInstance = new PreferenceUtil(context);
-        }
-
-        return sInstance;
-    }
-
-    public String getTheme() {
-        return mPreferences.getString(THEME, ThemeHelper.DEFAULT_MODE);
-    }
-
-    public String getServer() {
-        return mPreferences.getString(SERVER, "");
-    }
-
-    public void setServer(String server) {
-        final SharedPreferences.Editor editor = mPreferences.edit();
-        editor.putString(SERVER, server);
-        editor.apply();
-    }
-
-    public String getUser() {
-        return mPreferences.getString(USER, null);
-    }
-
-    public void setUser(String user) {
-        final SharedPreferences.Editor editor = mPreferences.edit();
-        editor.putString(USER, user);
-        editor.apply();
-    }
-
-    public String getPassword() {
-        return mPreferences.getString(PASSWORD, null);
-    }
-
-    public void setPassword(String password) {
-        final SharedPreferences.Editor editor = mPreferences.edit();
-        editor.putString(PASSWORD, password);
-        editor.apply();
-    }
-
-    public String getToken() {
-        return mPreferences.getString(TOKEN, null);
-    }
-
-    public void setToken(String token) {
-        final SharedPreferences.Editor editor = mPreferences.edit();
-        editor.putString(TOKEN, token);
-        editor.apply();
-    }
-
-    public String getSalt() {
-        return mPreferences.getString(SALT, null);
-    }
-
-    public void setSalt(String salt) {
-        final SharedPreferences.Editor editor = mPreferences.edit();
-        editor.putString(SALT, salt);
-        editor.apply();
-    }
-
-    public boolean isLowScurity() {
-        return mPreferences.getBoolean(LOW_SECURITY, false);
-    }
-
-    public void setLowSecurity(boolean isLowSecurity) {
-        final SharedPreferences.Editor editor = mPreferences.edit();
-        editor.putBoolean(LOW_SECURITY, isLowSecurity);
-        editor.apply();
-    }
-
-    public String getServerId() {
-        return mPreferences.getString(SERVER_ID, "");
-    }
-
-    public void setServerId(String serverId) {
-        final SharedPreferences.Editor editor = mPreferences.edit();
-        editor.putString(SERVER_ID, serverId);
-        editor.apply();
-    }
-
-    public float getPlaybackSpeed() {
-        return mPreferences.getFloat(PLAYBACK_SPEED, 1f);
-    }
-
-    public void setPlaybackSpeed(float playbackSpeed) {
-        final SharedPreferences.Editor editor = mPreferences.edit();
-        editor.putFloat(PLAYBACK_SPEED, playbackSpeed);
-        editor.apply();
-    }
-
-    public final boolean isSkipSilenceMode() {
-        return mPreferences.getBoolean(SKIP_SILENCE, false);
-    }
-
-    public void setSkipSilenceMode(Boolean isSkipSilenceMode) {
-        final SharedPreferences.Editor editor = mPreferences.edit();
-        editor.putBoolean(SKIP_SILENCE, isSkipSilenceMode);
-        editor.apply();
-    }
-
-    public final int getImageCacheSize() {
-        return Integer.parseInt(mPreferences.getString(IMAGE_CACHE_SIZE, "400000000"));
-    }
-
-    public final int getMediaCacheSize() {
-        return Integer.parseInt(mPreferences.getString(MEDIA_CACHE_SIZE, "400000000"));
-    }
-
-    public final int getImageSize() {
-        return Integer.parseInt(mPreferences.getString(IMAGE_SIZE, "-1"));
-    }
-
-    public final String getMaxBitrateWifi() {
-        return mPreferences.getString(MAX_BITRATE_WIFI, "0");
-    }
-
-    public final String getMaxBitrateMobile() {
-        return mPreferences.getString(MAX_BITRATE_MOBILE, "0");
-    }
-
-    public final String getAudioTranscodeFormatWifi() {
-        return mPreferences.getString(AUDIO_TRANSCODE_FORMAT_WIFI, "raw");
-    }
-
-    public final String getAudioTranscodeFormatMobile() {
-        return mPreferences.getString(AUDIO_TRANSCODE_FORMAT_MOBILE, "raw");
-    }
-
-    public final boolean isWifiOnly() {
-        return mPreferences.getBoolean(WIFI_ONLY, false);
-    }
-
-    public final boolean isDataSavingMode() {
-        return mPreferences.getBoolean(DATA_SAVING_MODE, false);
-    }
-
-    public void setDataSavingMode(Boolean isDataSavingModeEnabled) {
-        final SharedPreferences.Editor editor = mPreferences.edit();
-        editor.putBoolean(DATA_SAVING_MODE, isDataSavingModeEnabled);
-        editor.apply();
-    }
-
-    public final boolean isStarredSyncEnabled() {
-        return mPreferences.getBoolean(SYNC_STARRED_TRACKS_FOR_OFFLINE_USE, false);
-    }
-
-    public void setStarredSyncEnabled(Boolean isStarredSyncEnabled) {
-        final SharedPreferences.Editor editor = mPreferences.edit();
-        editor.putBoolean(SYNC_STARRED_TRACKS_FOR_OFFLINE_USE, isStarredSyncEnabled);
-        editor.apply();
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/util/Preferences.kt b/app/src/main/java/com/cappielloantonio/play/util/Preferences.kt
new file mode 100644
index 00000000..95ed7349
--- /dev/null
+++ b/app/src/main/java/com/cappielloantonio/play/util/Preferences.kt
@@ -0,0 +1,189 @@
+package com.cappielloantonio.play.util
+
+import com.cappielloantonio.play.App
+import com.cappielloantonio.play.helper.ThemeHelper
+
+object Preferences {
+    const val THEME = "theme"
+    private const val SERVER = "server"
+    private const val USER = "user"
+    private const val PASSWORD = "password"
+    private const val TOKEN = "token"
+    private const val SALT = "salt"
+    private const val LOW_SECURITY = "low_security"
+    private const val SERVER_ID = "server_id"
+    private const val PLAYBACK_SPEED = "playback_speed"
+    private const val SKIP_SILENCE = "skip_silence"
+    private const val IMAGE_CACHE_SIZE = "image_cache_size"
+    private const val IMAGE_SIZE = "image_size"
+    private const val MEDIA_CACHE_SIZE = "media_cache_size"
+    private const val MAX_BITRATE_WIFI = "max_bitrate_wifi"
+    private const val MAX_BITRATE_MOBILE = "max_bitrate_mobile"
+    private const val AUDIO_TRANSCODE_FORMAT_WIFI = "audio_transcode_format_wifi"
+    private const val AUDIO_TRANSCODE_FORMAT_MOBILE = "audio_transcode_format_mobile"
+    private const val WIFI_ONLY = "wifi_only"
+    private const val DATA_SAVING_MODE = "data_saving_mode"
+    private const val SYNC_STARRED_TRACKS_FOR_OFFLINE_USE = "sync_starred_tracks_for_offline_use"
+
+    @JvmStatic
+    fun getTheme(): String? {
+        return App.getInstance().preferences.getString(THEME, ThemeHelper.DEFAULT_MODE)
+    }
+
+    @JvmStatic
+    fun getServer(): String? {
+        return App.getInstance().preferences.getString(SERVER, null)
+    }
+
+    @JvmStatic
+    fun setServer(server: String?) {
+        App.getInstance().preferences.edit().putString(SERVER, server).apply()
+    }
+
+    @JvmStatic
+    fun getUser(): String? {
+        return App.getInstance().preferences.getString(USER, null)
+    }
+
+    @JvmStatic
+    fun setUser(user: String?) {
+        App.getInstance().preferences.edit().putString(USER, user).apply()
+    }
+
+    @JvmStatic
+    fun getPassword(): String? {
+        return App.getInstance().preferences.getString(PASSWORD, null)
+    }
+
+    @JvmStatic
+    fun setPassword(password: String?) {
+        App.getInstance().preferences.edit().putString(PASSWORD, password).apply()
+    }
+
+    @JvmStatic
+    fun getToken(): String? {
+        return App.getInstance().preferences.getString(TOKEN, null)
+    }
+
+    @JvmStatic
+    fun setToken(token: String?) {
+        App.getInstance().preferences.edit().putString(TOKEN, token).apply()
+    }
+
+    @JvmStatic
+    fun getSalt(): String? {
+        return App.getInstance().preferences.getString(SALT, null)
+    }
+
+    @JvmStatic
+    fun setSalt(salt: String?) {
+        App.getInstance().preferences.edit().putString(SALT, salt).apply()
+    }
+
+    @JvmStatic
+    fun isLowScurity(): Boolean {
+        return App.getInstance().preferences.getBoolean(LOW_SECURITY, false)
+    }
+
+    @JvmStatic
+    fun setLowSecurity(isLowSecurity: Boolean) {
+        App.getInstance().preferences.edit().putBoolean(LOW_SECURITY, isLowSecurity).apply()
+    }
+
+    @JvmStatic
+    fun getServerId(): String? {
+        return App.getInstance().preferences.getString(SERVER_ID, null)
+    }
+
+    @JvmStatic
+    fun setServerId(serverId: String?) {
+        App.getInstance().preferences.edit().putString(SERVER_ID, serverId).apply()
+    }
+
+    @JvmStatic
+    fun getPlaybackSpeed(): Float {
+        return App.getInstance().preferences.getFloat(PLAYBACK_SPEED, 1f)
+    }
+
+    @JvmStatic
+    fun setPlaybackSpeed(playbackSpeed: Float) {
+        App.getInstance().preferences.edit().putFloat(PLAYBACK_SPEED, playbackSpeed).apply()
+    }
+
+    @JvmStatic
+    fun isSkipSilenceMode(): Boolean {
+        return App.getInstance().preferences.getBoolean(SKIP_SILENCE, false)
+    }
+
+    @JvmStatic
+    fun setSkipSilenceMode(isSkipSilenceMode: Boolean) {
+        App.getInstance().preferences.edit().putBoolean(SKIP_SILENCE, isSkipSilenceMode)
+            .apply()
+    }
+
+    @JvmStatic
+    fun getImageCacheSize(): Int {
+        return App.getInstance().preferences.getString(IMAGE_CACHE_SIZE, "400000000")!!
+            .toInt()
+    }
+
+    @JvmStatic
+    fun getMediaCacheSize(): Int {
+        return App.getInstance().preferences.getString(MEDIA_CACHE_SIZE, "400000000")!!
+            .toInt()
+    }
+
+    @JvmStatic
+    fun getImageSize(): Int {
+        return App.getInstance().preferences.getString(IMAGE_SIZE, "-1")!!.toInt()
+    }
+
+    @JvmStatic
+    fun getMaxBitrateWifi(): String {
+        return App.getInstance().preferences.getString(MAX_BITRATE_WIFI, "0")!!
+    }
+
+    @JvmStatic
+    fun getMaxBitrateMobile(): String {
+        return App.getInstance().preferences.getString(MAX_BITRATE_MOBILE, "0")!!
+    }
+
+    @JvmStatic
+    fun getAudioTranscodeFormatWifi(): String {
+        return App.getInstance().preferences.getString(AUDIO_TRANSCODE_FORMAT_WIFI, "raw")!!
+    }
+
+    @JvmStatic
+    fun getAudioTranscodeFormatMobile(): String {
+        return App.getInstance().preferences.getString(AUDIO_TRANSCODE_FORMAT_MOBILE, "raw")!!
+    }
+
+    @JvmStatic
+    fun isWifiOnly(): Boolean {
+        return App.getInstance().preferences.getBoolean(WIFI_ONLY, false)
+    }
+
+    @JvmStatic
+    fun isDataSavingMode(): Boolean {
+        return App.getInstance().preferences.getBoolean(DATA_SAVING_MODE, false)
+    }
+
+    @JvmStatic
+    fun setDataSavingMode(isDataSavingModeEnabled: Boolean) {
+        App.getInstance().preferences.edit()
+            .putBoolean(DATA_SAVING_MODE, isDataSavingModeEnabled).apply()
+    }
+
+    @JvmStatic
+    fun isStarredSyncEnabled(): Boolean {
+        return App.getInstance().preferences
+            .getBoolean(SYNC_STARRED_TRACKS_FOR_OFFLINE_USE, false)
+    }
+
+    @JvmStatic
+    fun setStarredSyncEnabled(isStarredSyncEnabled: Boolean) {
+        App.getInstance().preferences.edit().putBoolean(
+            SYNC_STARRED_TRACKS_FOR_OFFLINE_USE, isStarredSyncEnabled
+        ).apply()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumBottomSheetViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumBottomSheetViewModel.java
index 7d23a994..75c1732b 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumBottomSheetViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumBottomSheetViewModel.java
@@ -7,19 +7,20 @@ import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
-import com.cappielloantonio.play.model.Album;
-import com.cappielloantonio.play.model.Artist;
-import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.repository.AlbumRepository;
 import com.cappielloantonio.play.repository.ArtistRepository;
+import com.cappielloantonio.play.subsonic.models.AlbumID3;
+import com.cappielloantonio.play.subsonic.models.ArtistID3;
+import com.cappielloantonio.play.subsonic.models.Child;
 
+import java.util.Date;
 import java.util.List;
 
 public class AlbumBottomSheetViewModel extends AndroidViewModel {
     private final AlbumRepository albumRepository;
     private final ArtistRepository artistRepository;
 
-    private Album album;
+    private AlbumID3 album;
 
     public AlbumBottomSheetViewModel(@NonNull Application application) {
         super(application);
@@ -28,29 +29,29 @@ public class AlbumBottomSheetViewModel extends AndroidViewModel {
         artistRepository = new ArtistRepository(application);
     }
 
-    public Album getAlbum() {
+    public AlbumID3 getAlbum() {
         return album;
     }
 
-    public void setAlbum(Album album) {
+    public void setAlbum(AlbumID3 album) {
         this.album = album;
     }
 
-    public LiveData<Artist> getArtist() {
+    public LiveData<ArtistID3> getArtist() {
         return artistRepository.getArtist(album.getArtistId());
     }
 
-    public MutableLiveData<List<Media>> getAlbumTracks() {
+    public MutableLiveData<List<Child>> getAlbumTracks() {
         return albumRepository.getAlbumTracks(album.getId());
     }
 
     public void setFavorite() {
-        if (Boolean.TRUE.equals(album.getStarred())) {
+        if (album.getStarred() != null) {
             artistRepository.unstar(album.getId());
-            album.setStarred(false);
+            album.setStarred(null);
         } else {
             artistRepository.star(album.getId());
-            album.setStarred(true);
+            album.setStarred(new Date());
         }
     }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumCatalogueViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumCatalogueViewModel.java
index 7e9415bb..0368990f 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumCatalogueViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumCatalogueViewModel.java
@@ -10,10 +10,8 @@ import androidx.lifecycle.MutableLiveData;
 
 import com.cappielloantonio.play.App;
 import com.cappielloantonio.play.interfaces.MediaCallback;
-import com.cappielloantonio.play.model.Album;
 import com.cappielloantonio.play.subsonic.models.AlbumID3;
 import com.cappielloantonio.play.subsonic.models.SubsonicResponse;
-import com.cappielloantonio.play.util.MappingUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,7 +20,7 @@ import retrofit2.Call;
 import retrofit2.Callback;
 
 public class AlbumCatalogueViewModel extends AndroidViewModel {
-    private final MutableLiveData<List<Album>> albumList = new MutableLiveData<>(new ArrayList<>());
+    private final MutableLiveData<List<AlbumID3>> albumList = new MutableLiveData<>(new ArrayList<>());
 
     private int page = 0;
 
@@ -30,7 +28,7 @@ public class AlbumCatalogueViewModel extends AndroidViewModel {
         super(application);
     }
 
-    public LiveData<List<Album>> getAlbumList() {
+    public LiveData<List<AlbumID3>> getAlbumList() {
         return albumList;
     }
 
@@ -42,9 +40,11 @@ public class AlbumCatalogueViewModel extends AndroidViewModel {
 
             @Override
             public void onLoadMedia(List<?> media) {
-                List<Album> liveAlbum = albumList.getValue();
+                List<AlbumID3> liveAlbum = albumList.getValue();
+
                 if (liveAlbum == null) liveAlbum = new ArrayList<>();
-                liveAlbum.addAll(MappingUtil.mapAlbum((List<AlbumID3>) media));
+
+                liveAlbum.addAll((List<AlbumID3>) media);
                 albumList.setValue(liveAlbum);
 
                 if (media.size() == size) {
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumListPageViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumListPageViewModel.java
index df1736d4..bac2c3c9 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumListPageViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumListPageViewModel.java
@@ -3,17 +3,16 @@ package com.cappielloantonio.play.viewmodel;
 import android.app.Application;
 
 import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
 import com.cappielloantonio.play.model.Album;
-import com.cappielloantonio.play.model.Artist;
 import com.cappielloantonio.play.repository.AlbumRepository;
 import com.cappielloantonio.play.repository.DownloadRepository;
-import com.cappielloantonio.play.util.MappingUtil;
+import com.cappielloantonio.play.subsonic.models.AlbumID3;
+import com.cappielloantonio.play.subsonic.models.ArtistID3;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -25,9 +24,9 @@ public class AlbumListPageViewModel extends AndroidViewModel {
     private final DownloadRepository downloadRepository;
 
     public String title;
-    public Artist artist;
+    public ArtistID3 artist;
 
-    private MutableLiveData<List<Album>> albumList;
+    private MutableLiveData<List<AlbumID3>> albumList;
 
     public AlbumListPageViewModel(@NonNull Application application) {
         super(application);
@@ -36,7 +35,7 @@ public class AlbumListPageViewModel extends AndroidViewModel {
         downloadRepository = new DownloadRepository(application);
     }
 
-    public LiveData<List<Album>> getAlbumList(LifecycleOwner owner) {
+    public LiveData<List<AlbumID3>> getAlbumList(LifecycleOwner owner) {
         albumList = new MutableLiveData<>(new ArrayList<>());
 
         switch (title) {
@@ -55,15 +54,17 @@ public class AlbumListPageViewModel extends AndroidViewModel {
             case Album.NEW_RELEASES:
                 int currentYear = Calendar.getInstance().get(Calendar.YEAR);
                 albumRepository.getAlbums("byYear", 500, currentYear, currentYear).observe(owner, albums -> {
-                    albums.sort(Comparator.comparing(Album::getCreated).reversed());
+                    albums.sort(Comparator.comparing(AlbumID3::getCreated).reversed());
                     albumList.postValue(albums.subList(0, Math.min(20, albums.size())));
                 });
                 break;
             case Album.DOWNLOADED:
-                downloadRepository.getLiveDownload().observe(owner, downloads -> albumList.setValue(MappingUtil.mapDownloadToAlbum(downloads)));
+                // TODO
+                // downloadRepository.getLiveDownload().observe(owner, downloads -> albumList.setValue(MappingUtil.mapDownloadToAlbum(downloads)));
                 break;
             case Album.FROM_ARTIST:
-                downloadRepository.getLiveDownloadFromArtist(artist.getId()).observe(owner, downloads -> albumList.setValue(MappingUtil.mapDownloadToAlbum(downloads)));
+                // TODO
+                // downloadRepository.getLiveDownloadFromArtist(artist.getId()).observe(owner, downloads -> albumList.setValue(MappingUtil.mapDownloadToAlbum(downloads)));
                 break;
         }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumPageViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumPageViewModel.java
index 495c87e0..832bb1bc 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumPageViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumPageViewModel.java
@@ -8,13 +8,12 @@ import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
-import com.cappielloantonio.play.model.Album;
-import com.cappielloantonio.play.model.Artist;
-import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.repository.AlbumRepository;
 import com.cappielloantonio.play.repository.ArtistRepository;
 import com.cappielloantonio.play.repository.DownloadRepository;
-import com.cappielloantonio.play.util.MappingUtil;
+import com.cappielloantonio.play.subsonic.models.AlbumID3;
+import com.cappielloantonio.play.subsonic.models.ArtistID3;
+import com.cappielloantonio.play.subsonic.models.Child;
 
 import java.util.List;
 
@@ -23,9 +22,9 @@ public class AlbumPageViewModel extends AndroidViewModel {
     private final ArtistRepository artistRepository;
     private final DownloadRepository downloadRepository;
 
-    private MutableLiveData<List<Media>> songLiveList = new MutableLiveData<>();
+    private MutableLiveData<List<Child>> songLiveList = new MutableLiveData<>();
 
-    private Album album;
+    private AlbumID3 album;
     private boolean isOffline;
 
     public AlbumPageViewModel(@NonNull Application application) {
@@ -36,9 +35,10 @@ public class AlbumPageViewModel extends AndroidViewModel {
         downloadRepository = new DownloadRepository(application);
     }
 
-    public LiveData<List<Media>> getAlbumSongLiveList(LifecycleOwner owner) {
+    public LiveData<List<Child>> getAlbumSongLiveList(LifecycleOwner owner) {
         if (isOffline) {
-            downloadRepository.getLiveDownloadFromAlbum(album.getId()).observe(owner, downloads -> songLiveList.postValue(MappingUtil.mapDownloadToMedia(downloads)));
+            // TODO
+            //downloadRepository.getLiveDownloadFromAlbum(album.getId()).observe(owner, downloads -> songLiveList.postValue(MappingUtil.mapDownloadToMedia(downloads)));
         } else {
             songLiveList = albumRepository.getAlbumTracks(album.getId());
         }
@@ -46,11 +46,11 @@ public class AlbumPageViewModel extends AndroidViewModel {
         return songLiveList;
     }
 
-    public Album getAlbum() {
+    public AlbumID3 getAlbum() {
         return album;
     }
 
-    public void setAlbum(Album album) {
+    public void setAlbum(AlbumID3 album) {
         this.album = album;
     }
 
@@ -58,7 +58,7 @@ public class AlbumPageViewModel extends AndroidViewModel {
         isOffline = offline;
     }
 
-    public LiveData<Artist> getArtist() {
+    public LiveData<ArtistID3> getArtist() {
         return artistRepository.getArtistInfo(album.getArtistId());
     }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistBottomSheetViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistBottomSheetViewModel.java
index dda967ef..5af36135 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistBottomSheetViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistBottomSheetViewModel.java
@@ -5,13 +5,15 @@ import android.app.Application;
 import androidx.annotation.NonNull;
 import androidx.lifecycle.AndroidViewModel;
 
-import com.cappielloantonio.play.model.Artist;
 import com.cappielloantonio.play.repository.AlbumRepository;
+import com.cappielloantonio.play.subsonic.models.ArtistID3;
+
+import java.util.Date;
 
 public class ArtistBottomSheetViewModel extends AndroidViewModel {
     private final AlbumRepository albumRepository;
 
-    private Artist artist;
+    private ArtistID3 artist;
 
     public ArtistBottomSheetViewModel(@NonNull Application application) {
         super(application);
@@ -19,21 +21,21 @@ public class ArtistBottomSheetViewModel extends AndroidViewModel {
         albumRepository = new AlbumRepository(application);
     }
 
-    public Artist getArtist() {
+    public ArtistID3 getArtist() {
         return artist;
     }
 
-    public void setArtist(Artist artist) {
+    public void setArtist(ArtistID3 artist) {
         this.artist = artist;
     }
 
     public void setFavorite() {
-        if (Boolean.TRUE.equals(artist.getStarred())) {
+        if (artist.getStarred() != null) {
             albumRepository.unstar(artist.getId());
-            artist.setStarred(false);
+            artist.setStarred(null);
         } else {
             albumRepository.star(artist.getId());
-            artist.setStarred(true);
+            artist.setStarred(new Date());
         }
     }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistCatalogueViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistCatalogueViewModel.java
index 1781f59f..d3513de4 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistCatalogueViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistCatalogueViewModel.java
@@ -9,11 +9,9 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
 import com.cappielloantonio.play.App;
-import com.cappielloantonio.play.model.Artist;
 import com.cappielloantonio.play.subsonic.models.ArtistID3;
 import com.cappielloantonio.play.subsonic.models.IndexID3;
 import com.cappielloantonio.play.subsonic.models.SubsonicResponse;
-import com.cappielloantonio.play.util.MappingUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,13 +20,13 @@ import retrofit2.Call;
 import retrofit2.Callback;
 
 public class ArtistCatalogueViewModel extends AndroidViewModel {
-    private final MutableLiveData<List<Artist>> artistList = new MutableLiveData<>(new ArrayList<>());
+    private final MutableLiveData<List<ArtistID3>> artistList = new MutableLiveData<>(new ArrayList<>());
 
     public ArtistCatalogueViewModel(@NonNull Application application) {
         super(application);
     }
 
-    public LiveData<List<Artist>> getArtistList() {
+    public LiveData<List<ArtistID3>> getArtistList() {
         return artistList;
     }
 
@@ -46,7 +44,7 @@ public class ArtistCatalogueViewModel extends AndroidViewModel {
                                 artists.addAll(index.getArtists());
                             }
 
-                            artistList.setValue(MappingUtil.mapArtist(artists));
+                            artistList.setValue(artists);
                         }
                     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistListPageViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistListPageViewModel.java
index 29297db9..b71c7482 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistListPageViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistListPageViewModel.java
@@ -3,7 +3,6 @@ package com.cappielloantonio.play.viewmodel;
 import android.app.Application;
 
 import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
@@ -13,7 +12,7 @@ import com.cappielloantonio.play.model.Artist;
 import com.cappielloantonio.play.model.Download;
 import com.cappielloantonio.play.repository.ArtistRepository;
 import com.cappielloantonio.play.repository.DownloadRepository;
-import com.cappielloantonio.play.util.MappingUtil;
+import com.cappielloantonio.play.subsonic.models.ArtistID3;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -27,7 +26,7 @@ public class ArtistListPageViewModel extends AndroidViewModel {
 
     public String title;
 
-    private MutableLiveData<List<Artist>> artistList;
+    private MutableLiveData<List<ArtistID3>> artistList;
 
     public ArtistListPageViewModel(@NonNull Application application) {
         super(application);
@@ -36,7 +35,7 @@ public class ArtistListPageViewModel extends AndroidViewModel {
         downloadRepository = new DownloadRepository(application);
     }
 
-    public LiveData<List<Artist>> getArtistList(LifecycleOwner owner) {
+    public LiveData<List<ArtistID3>> getArtistList(LifecycleOwner owner) {
         artistList = new MutableLiveData<>(new ArrayList<>());
 
         switch (title) {
@@ -48,10 +47,11 @@ public class ArtistListPageViewModel extends AndroidViewModel {
                     List<Download> unique = downloads
                             .stream()
                             .collect(Collectors.collectingAndThen(
-                                    Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(Download::getArtistName))), ArrayList::new)
+                                    Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(Download::getArtist))), ArrayList::new)
                             );
 
-                    artistList.setValue(MappingUtil.mapDownloadToArtist(unique));
+                    // TODO
+                    // artistList.setValue(MappingUtil.mapDownloadToArtist(unique));
                 });
                 break;
         }
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistPageViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistPageViewModel.java
index fc6dd2f6..25363aae 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistPageViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistPageViewModel.java
@@ -6,11 +6,12 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 
-import com.cappielloantonio.play.model.Album;
-import com.cappielloantonio.play.model.Artist;
-import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.repository.AlbumRepository;
 import com.cappielloantonio.play.repository.ArtistRepository;
+import com.cappielloantonio.play.subsonic.models.AlbumID3;
+import com.cappielloantonio.play.subsonic.models.ArtistID3;
+import com.cappielloantonio.play.subsonic.models.ArtistInfo2;
+import com.cappielloantonio.play.subsonic.models.Child;
 
 import java.util.List;
 
@@ -18,7 +19,7 @@ public class ArtistPageViewModel extends AndroidViewModel {
     private final AlbumRepository albumRepository;
     private final ArtistRepository artistRepository;
 
-    private Artist artist;
+    private ArtistID3 artist;
 
     public ArtistPageViewModel(@NonNull Application application) {
         super(application);
@@ -27,23 +28,23 @@ public class ArtistPageViewModel extends AndroidViewModel {
         artistRepository = new ArtistRepository(application);
     }
 
-    public LiveData<List<Album>> getAlbumList() {
+    public LiveData<List<AlbumID3>> getAlbumList() {
         return albumRepository.getArtistAlbums(artist.getId());
     }
 
-    public LiveData<Artist> getArtistInfo(String id) {
+    public LiveData<ArtistInfo2> getArtistInfo(String id) {
         return artistRepository.getArtistFullInfo(id);
     }
 
-    public LiveData<List<Media>> getArtistTopSongList(int count) {
+    public LiveData<List<Child>> getArtistTopSongList(int count) {
         return artistRepository.getTopSongs(artist.getName(), count);
     }
 
-    public Artist getArtist() {
+    public ArtistID3 getArtist() {
         return artist;
     }
 
-    public void setArtist(Artist artist) {
+    public void setArtist(ArtistID3 artist) {
         this.artist = artist;
     }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/DownloadViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/DownloadViewModel.java
index 94ee1080..f4e85f3e 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/DownloadViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/DownloadViewModel.java
@@ -11,11 +11,12 @@ import androidx.lifecycle.MutableLiveData;
 import com.cappielloantonio.play.model.Album;
 import com.cappielloantonio.play.model.Artist;
 import com.cappielloantonio.play.model.Playlist;
-import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.repository.DownloadRepository;
+import com.cappielloantonio.play.subsonic.models.Child;
 import com.cappielloantonio.play.util.MappingUtil;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class DownloadViewModel extends AndroidViewModel {
     private static final String TAG = "HomeViewModel";
@@ -24,7 +25,7 @@ public class DownloadViewModel extends AndroidViewModel {
 
     private final MutableLiveData<List<Artist>> downloadedArtistSample = new MutableLiveData<>(null);
     private final MutableLiveData<List<Album>> downloadedAlbumSample = new MutableLiveData<>(null);
-    private final MutableLiveData<List<Media>> downloadedTrackSample = new MutableLiveData<>(null);
+    private final MutableLiveData<List<Child>> downloadedTrackSample = new MutableLiveData<>(null);
     private final MutableLiveData<List<Playlist>> downloadedPlaylistSample = new MutableLiveData<>(null);
 
     public DownloadViewModel(@NonNull Application application) {
@@ -43,8 +44,8 @@ public class DownloadViewModel extends AndroidViewModel {
         return downloadedAlbumSample;
     }
 
-    public LiveData<List<Media>> getDownloadedTracks(LifecycleOwner owner, int size) {
-        downloadRepository.getLiveDownloadSample(size, false, false, true, false).observe(owner, downloads -> downloadedTrackSample.postValue(MappingUtil.mapDownloadToMedia(downloads)));
+    public LiveData<List<Child>> getDownloadedTracks(LifecycleOwner owner, int size) {
+        downloadRepository.getLiveDownloadSample(size, false, false, true, false).observe(owner, downloads -> downloadedTrackSample.postValue(downloads.stream().map(download -> (Child) download).collect(Collectors.toList())));
         return downloadedTrackSample;
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/FilterViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/FilterViewModel.java
index 70b740fe..085c55c8 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/FilterViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/FilterViewModel.java
@@ -6,8 +6,8 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 
-import com.cappielloantonio.play.model.Genre;
 import com.cappielloantonio.play.repository.GenreRepository;
+import com.cappielloantonio.play.subsonic.models.Genre;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/GenreCatalogueViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/GenreCatalogueViewModel.java
index cc449d37..c1669348 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/GenreCatalogueViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/GenreCatalogueViewModel.java
@@ -6,8 +6,8 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 
-import com.cappielloantonio.play.model.Genre;
 import com.cappielloantonio.play.repository.GenreRepository;
+import com.cappielloantonio.play.subsonic.models.Genre;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/HomeViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/HomeViewModel.java
index 2163c506..f71181c1 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/HomeViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/HomeViewModel.java
@@ -8,21 +8,20 @@ import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
-import com.cappielloantonio.play.App;
-import com.cappielloantonio.play.model.Album;
-import com.cappielloantonio.play.model.Artist;
 import com.cappielloantonio.play.model.Chronology;
-import com.cappielloantonio.play.model.Media;
-import com.cappielloantonio.play.model.Playlist;
 import com.cappielloantonio.play.repository.AlbumRepository;
 import com.cappielloantonio.play.repository.ArtistRepository;
 import com.cappielloantonio.play.repository.ChronologyRepository;
 import com.cappielloantonio.play.repository.PlaylistRepository;
 import com.cappielloantonio.play.repository.PodcastRepository;
 import com.cappielloantonio.play.repository.SongRepository;
-import com.cappielloantonio.play.util.PreferenceUtil;
+import com.cappielloantonio.play.subsonic.models.AlbumID3;
+import com.cappielloantonio.play.subsonic.models.ArtistID3;
+import com.cappielloantonio.play.subsonic.models.Child;
+import com.cappielloantonio.play.subsonic.models.Playlist;
+import com.cappielloantonio.play.subsonic.models.PodcastEpisode;
+import com.cappielloantonio.play.util.Preferences;
 
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
@@ -38,25 +37,25 @@ public class HomeViewModel extends AndroidViewModel {
     private final PodcastRepository podcastRepository;
     private final ChronologyRepository chronologyRepository;
 
-    private final MutableLiveData<List<Media>> dicoverSongSample = new MutableLiveData<>(null);
-    private final MutableLiveData<List<Album>> newReleasedAlbum = new MutableLiveData<>(null);
-    private final MutableLiveData<List<Media>> starredTracksSample = new MutableLiveData<>(null);
-    private final MutableLiveData<List<Artist>> starredArtistsSample = new MutableLiveData<>(null);
-    private final MutableLiveData<List<Artist>> bestOfArtists = new MutableLiveData<>(null);
-    private final MutableLiveData<List<Media>> starredTracks = new MutableLiveData<>(null);
-    private final MutableLiveData<List<Album>> starredAlbums = new MutableLiveData<>(null);
-    private final MutableLiveData<List<Artist>> starredArtists = new MutableLiveData<>(null);
-    private final MutableLiveData<List<Album>> mostPlayedAlbumSample = new MutableLiveData<>(null);
-    private final MutableLiveData<List<Album>> recentlyPlayedAlbumSample = new MutableLiveData<>(null);
+    private final MutableLiveData<List<Child>> dicoverSongSample = new MutableLiveData<>(null);
+    private final MutableLiveData<List<AlbumID3>> newReleasedAlbum = new MutableLiveData<>(null);
+    private final MutableLiveData<List<Child>> starredTracksSample = new MutableLiveData<>(null);
+    private final MutableLiveData<List<ArtistID3>> starredArtistsSample = new MutableLiveData<>(null);
+    private final MutableLiveData<List<ArtistID3>> bestOfArtists = new MutableLiveData<>(null);
+    private final MutableLiveData<List<Child>> starredTracks = new MutableLiveData<>(null);
+    private final MutableLiveData<List<AlbumID3>> starredAlbums = new MutableLiveData<>(null);
+    private final MutableLiveData<List<ArtistID3>> starredArtists = new MutableLiveData<>(null);
+    private final MutableLiveData<List<AlbumID3>> mostPlayedAlbumSample = new MutableLiveData<>(null);
+    private final MutableLiveData<List<AlbumID3>> recentlyPlayedAlbumSample = new MutableLiveData<>(null);
     private final MutableLiveData<List<Integer>> years = new MutableLiveData<>(null);
-    private final MutableLiveData<List<Album>> recentlyAddedAlbumSample = new MutableLiveData<>(null);
+    private final MutableLiveData<List<AlbumID3>> recentlyAddedAlbumSample = new MutableLiveData<>(null);
     private final MutableLiveData<List<Playlist>> pinnedPlaylists = new MutableLiveData<>(null);
-    private final MutableLiveData<List<Media>> newestPodcastEpisodes = new MutableLiveData<>(null);
+    private final MutableLiveData<List<PodcastEpisode>> newestPodcastEpisodes = new MutableLiveData<>(null);
 
     private final MutableLiveData<List<Chronology>> thisGridTopSong = new MutableLiveData<>(null);
-    private final MutableLiveData<List<Media>> mediaInstantMix = new MutableLiveData<>(null);
-    private final MutableLiveData<List<Media>> artistInstantMix = new MutableLiveData<>(null);
-    private final MutableLiveData<List<Media>> artistBestOf = new MutableLiveData<>(null);
+    private final MutableLiveData<List<Child>> mediaInstantMix = new MutableLiveData<>(null);
+    private final MutableLiveData<List<Child>> artistInstantMix = new MutableLiveData<>(null);
+    private final MutableLiveData<List<Child>> artistBestOf = new MutableLiveData<>(null);
 
     public HomeViewModel(@NonNull Application application) {
         super(application);
@@ -69,7 +68,7 @@ public class HomeViewModel extends AndroidViewModel {
         chronologyRepository = new ChronologyRepository(application);
     }
 
-    public LiveData<List<Media>> getDiscoverSongSample(LifecycleOwner owner) {
+    public LiveData<List<Child>> getDiscoverSongSample(LifecycleOwner owner) {
         if (dicoverSongSample.getValue() == null) {
             songRepository.getRandomSample(10, null, null).observe(owner, dicoverSongSample::postValue);
         }
@@ -80,7 +79,7 @@ public class HomeViewModel extends AndroidViewModel {
     public LiveData<List<Chronology>> getGridSongSample(LifecycleOwner owner) {
         Calendar cal = Calendar.getInstance();
         int dayOfMonth = cal.get(Calendar.DAY_OF_MONTH);
-        String server = PreferenceUtil.getInstance(App.getInstance()).getServerId();
+        String server = Preferences.getServerId();
 
         if (thisGridTopSong.getValue() == null) {
             if (dayOfMonth >= 7) {
@@ -93,12 +92,12 @@ public class HomeViewModel extends AndroidViewModel {
         return thisGridTopSong;
     }
 
-    public LiveData<List<Album>> getRecentlyReleasedAlbums(LifecycleOwner owner) {
+    public LiveData<List<AlbumID3>> getRecentlyReleasedAlbums(LifecycleOwner owner) {
         if (newReleasedAlbum.getValue() == null) {
             int currentYear = Calendar.getInstance().get(Calendar.YEAR);
 
             albumRepository.getAlbums("byYear", 500, currentYear, currentYear).observe(owner, albums -> {
-                albums.sort(Comparator.comparing(Album::getCreated).reversed());
+                albums.sort(Comparator.comparing(AlbumID3::getCreated).reversed());
                 newReleasedAlbum.postValue(albums.subList(0, Math.min(20, albums.size())));
             });
         }
@@ -106,7 +105,7 @@ public class HomeViewModel extends AndroidViewModel {
         return newReleasedAlbum;
     }
 
-    public LiveData<List<Media>> getStarredTracksSample(LifecycleOwner owner) {
+    public LiveData<List<Child>> getStarredTracksSample(LifecycleOwner owner) {
         if (starredTracksSample.getValue() == null) {
             songRepository.getStarredSongs(true, 10).observe(owner, starredTracksSample::postValue);
         }
@@ -114,7 +113,7 @@ public class HomeViewModel extends AndroidViewModel {
         return starredTracksSample;
     }
 
-    public LiveData<List<Artist>> getStarredArtistsSample(LifecycleOwner owner) {
+    public LiveData<List<ArtistID3>> getStarredArtistsSample(LifecycleOwner owner) {
         if (starredArtistsSample.getValue() == null) {
             artistRepository.getStarredArtists(true, 10).observe(owner, starredArtistsSample::postValue);
         }
@@ -122,7 +121,7 @@ public class HomeViewModel extends AndroidViewModel {
         return starredArtistsSample;
     }
 
-    public LiveData<List<Artist>> getBestOfArtists(LifecycleOwner owner) {
+    public LiveData<List<ArtistID3>> getBestOfArtists(LifecycleOwner owner) {
         if (bestOfArtists.getValue() == null) {
             artistRepository.getStarredArtists(true, 20).observe(owner, bestOfArtists::postValue);
         }
@@ -130,7 +129,7 @@ public class HomeViewModel extends AndroidViewModel {
         return bestOfArtists;
     }
 
-    public LiveData<List<Media>> getStarredTracks(LifecycleOwner owner) {
+    public LiveData<List<Child>> getStarredTracks(LifecycleOwner owner) {
         if (starredTracks.getValue() == null) {
             songRepository.getStarredSongs(true, 20).observe(owner, starredTracks::postValue);
         }
@@ -138,7 +137,7 @@ public class HomeViewModel extends AndroidViewModel {
         return starredTracks;
     }
 
-    public LiveData<List<Album>> getStarredAlbums(LifecycleOwner owner) {
+    public LiveData<List<AlbumID3>> getStarredAlbums(LifecycleOwner owner) {
         if (starredAlbums.getValue() == null) {
             albumRepository.getStarredAlbums(true, 20).observe(owner, starredAlbums::postValue);
         }
@@ -146,7 +145,7 @@ public class HomeViewModel extends AndroidViewModel {
         return starredAlbums;
     }
 
-    public LiveData<List<Artist>> getStarredArtists(LifecycleOwner owner) {
+    public LiveData<List<ArtistID3>> getStarredArtists(LifecycleOwner owner) {
         if (starredArtists.getValue() == null) {
             artistRepository.getStarredArtists(true, 20).observe(owner, starredArtists::postValue);
         }
@@ -162,7 +161,7 @@ public class HomeViewModel extends AndroidViewModel {
         return years;
     }
 
-    public LiveData<List<Album>> getMostPlayedAlbums(LifecycleOwner owner) {
+    public LiveData<List<AlbumID3>> getMostPlayedAlbums(LifecycleOwner owner) {
         if (mostPlayedAlbumSample.getValue() == null) {
             albumRepository.getAlbums("frequent", 20, null, null).observe(owner, mostPlayedAlbumSample::postValue);
         }
@@ -170,7 +169,7 @@ public class HomeViewModel extends AndroidViewModel {
         return mostPlayedAlbumSample;
     }
 
-    public LiveData<List<Album>> getMostRecentlyAddedAlbums(LifecycleOwner owner) {
+    public LiveData<List<AlbumID3>> getMostRecentlyAddedAlbums(LifecycleOwner owner) {
         if (recentlyAddedAlbumSample.getValue() == null) {
             albumRepository.getAlbums("newest", 20, null, null).observe(owner, recentlyAddedAlbumSample::postValue);
         }
@@ -178,7 +177,7 @@ public class HomeViewModel extends AndroidViewModel {
         return recentlyAddedAlbumSample;
     }
 
-    public LiveData<List<Album>> getRecentlyPlayedAlbumList(LifecycleOwner owner) {
+    public LiveData<List<AlbumID3>> getRecentlyPlayedAlbumList(LifecycleOwner owner) {
         if (recentlyPlayedAlbumSample.getValue() == null) {
             albumRepository.getAlbums("recent", 20, null, null).observe(owner, recentlyPlayedAlbumSample::postValue);
         }
@@ -187,7 +186,7 @@ public class HomeViewModel extends AndroidViewModel {
     }
 
     public LiveData<List<Playlist>> getPinnedPlaylistList(LifecycleOwner owner, int maxNumber, boolean random) {
-        playlistRepository.getPinnedPlaylists(PreferenceUtil.getInstance(App.getInstance()).getServerId()).observe(owner, playlists -> {
+        playlistRepository.getPinnedPlaylists(Preferences.getServerId()).observe(owner, playlists -> {
             if (random) Collections.shuffle(playlists);
             List<Playlist> subPlaylist = playlists.subList(0, Math.min(maxNumber, playlists.size()));
             pinnedPlaylists.postValue(subPlaylist);
@@ -196,11 +195,11 @@ public class HomeViewModel extends AndroidViewModel {
         return pinnedPlaylists;
     }
 
-    public LiveData<List<Media>> getPlaylistSongLiveList(String playlistId) {
+    public LiveData<List<Child>> getPlaylistSongLiveList(String playlistId) {
         return playlistRepository.getPlaylistSongs(playlistId);
     }
 
-    public LiveData<List<Media>> getNewestPodcastEpisodes(LifecycleOwner owner) {
+    public LiveData<List<PodcastEpisode>> getNewestPodcastEpisodes(LifecycleOwner owner) {
         if (newestPodcastEpisodes.getValue() == null) {
             podcastRepository.getNewestPodcastEpisodes(20).observe(owner, newestPodcastEpisodes::postValue);
         }
@@ -208,7 +207,7 @@ public class HomeViewModel extends AndroidViewModel {
         return newestPodcastEpisodes;
     }
 
-    public LiveData<List<Media>> getMediaInstantMix(LifecycleOwner owner, Media media) {
+    public LiveData<List<Child>> getMediaInstantMix(LifecycleOwner owner, Child media) {
         mediaInstantMix.setValue(Collections.emptyList());
 
         songRepository.getInstantMix(media, 20).observe(owner, mediaInstantMix::postValue);
@@ -216,11 +215,11 @@ public class HomeViewModel extends AndroidViewModel {
         return mediaInstantMix;
     }
 
-    public LiveData<ArrayList<Media>> getArtistInstantMix(Artist artist) {
+    public LiveData<List<Child>> getArtistInstantMix(ArtistID3 artist) {
         return artistRepository.getInstantMix(artist, 20);
     }
 
-    public LiveData<List<Media>> getArtistBestOf(Artist artist) {
+    public LiveData<List<Child>> getArtistBestOf(ArtistID3 artist) {
         return artistRepository.getTopSongs(artist.getName(), 10);
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/LibraryViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/LibraryViewModel.java
index a205bdc6..bd28470e 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/LibraryViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/LibraryViewModel.java
@@ -8,14 +8,14 @@ import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
-import com.cappielloantonio.play.model.Album;
-import com.cappielloantonio.play.model.Artist;
-import com.cappielloantonio.play.model.Genre;
-import com.cappielloantonio.play.model.Playlist;
 import com.cappielloantonio.play.repository.AlbumRepository;
 import com.cappielloantonio.play.repository.ArtistRepository;
 import com.cappielloantonio.play.repository.GenreRepository;
 import com.cappielloantonio.play.repository.PlaylistRepository;
+import com.cappielloantonio.play.subsonic.models.AlbumID3;
+import com.cappielloantonio.play.subsonic.models.ArtistID3;
+import com.cappielloantonio.play.subsonic.models.Genre;
+import com.cappielloantonio.play.subsonic.models.Playlist;
 
 import java.util.List;
 
@@ -28,8 +28,8 @@ public class LibraryViewModel extends AndroidViewModel {
     private final PlaylistRepository playlistRepository;
 
     private final MutableLiveData<List<Playlist>> playlistSample = new MutableLiveData<>(null);
-    private final MutableLiveData<List<Album>> sampleAlbum = new MutableLiveData<>(null);
-    private final MutableLiveData<List<Artist>> sampleArtist = new MutableLiveData<>(null);
+    private final MutableLiveData<List<AlbumID3>> sampleAlbum = new MutableLiveData<>(null);
+    private final MutableLiveData<List<ArtistID3>> sampleArtist = new MutableLiveData<>(null);
     private final MutableLiveData<List<Genre>> sampleGenres = new MutableLiveData<>(null);
 
     public LibraryViewModel(@NonNull Application application) {
@@ -41,7 +41,7 @@ public class LibraryViewModel extends AndroidViewModel {
         playlistRepository = new PlaylistRepository(application);
     }
 
-    public LiveData<List<Album>> getAlbumSample(LifecycleOwner owner) {
+    public LiveData<List<AlbumID3>> getAlbumSample(LifecycleOwner owner) {
         if (sampleAlbum.getValue() == null) {
             albumRepository.getAlbums("random", 10, null, null).observe(owner, sampleAlbum::postValue);
         }
@@ -49,7 +49,7 @@ public class LibraryViewModel extends AndroidViewModel {
         return sampleAlbum;
     }
 
-    public LiveData<List<Artist>> getArtistSample(LifecycleOwner owner) {
+    public LiveData<List<ArtistID3>> getArtistSample(LifecycleOwner owner) {
         if (sampleArtist.getValue() == null) {
             artistRepository.getArtists(true, 10).observe(owner, sampleArtist::postValue);
         }
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/PlayerBottomSheetViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/PlayerBottomSheetViewModel.java
index 7b945e5a..141a18a7 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/PlayerBottomSheetViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/PlayerBottomSheetViewModel.java
@@ -11,17 +11,16 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.media3.common.util.UnstableApi;
 
-import com.cappielloantonio.play.model.Artist;
-import com.cappielloantonio.play.model.Queue;
 import com.cappielloantonio.play.model.Media;
+import com.cappielloantonio.play.model.Queue;
 import com.cappielloantonio.play.repository.ArtistRepository;
 import com.cappielloantonio.play.repository.QueueRepository;
 import com.cappielloantonio.play.repository.SongRepository;
-import com.cappielloantonio.play.util.DownloadUtil;
-import com.cappielloantonio.play.util.MappingUtil;
-import com.cappielloantonio.play.util.PreferenceUtil;
+import com.cappielloantonio.play.subsonic.models.ArtistID3;
+import com.cappielloantonio.play.subsonic.models.Child;
 
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 @OptIn(markerClass = UnstableApi.class)
@@ -34,9 +33,9 @@ public class PlayerBottomSheetViewModel extends AndroidViewModel {
 
     private final MutableLiveData<String> lyricsLiveData = new MutableLiveData<>(null);
 
-    private final MutableLiveData<Media> liveMedia = new MutableLiveData<>(null);
-    private final MutableLiveData<Artist> liveArtist = new MutableLiveData<>(null);
-    private final MutableLiveData<List<Media>> instantMix = new MutableLiveData<>(null);
+    private final MutableLiveData<Child> liveMedia = new MutableLiveData<>(null);
+    private final MutableLiveData<ArtistID3> liveArtist = new MutableLiveData<>(null);
+    private final MutableLiveData<List<Child>> instantMix = new MutableLiveData<>(null);
 
 
     public PlayerBottomSheetViewModel(@NonNull Application application) {
@@ -51,21 +50,22 @@ public class PlayerBottomSheetViewModel extends AndroidViewModel {
         return queueRepository.getLiveQueue();
     }
 
-    public void setFavorite(Context context, Media media) {
+    public void setFavorite(Context context, Child media) {
         if (media != null) {
-            if (Boolean.TRUE.equals(media.getStarred())) {
+            if (media.getStarred() != null) {
                 songRepository.unstar(media.getId());
-                media.setStarred(false);
+                media.setStarred(null);
             } else {
                 songRepository.star(media.getId());
-                media.setStarred(true);
+                media.setStarred(new Date());
 
-                if (PreferenceUtil.getInstance(context).isStarredSyncEnabled()) {
+                // TODO
+                /* if (Preferences.isStarredSyncEnabled()) {
                     DownloadUtil.getDownloadTracker(context).download(
                             MappingUtil.mapMediaItem(context, media, false),
                             MappingUtil.mapDownload(media, null, null)
                     );
-                }
+                } */
             }
         }
     }
@@ -74,16 +74,16 @@ public class PlayerBottomSheetViewModel extends AndroidViewModel {
         return lyricsLiveData;
     }
 
-    public void refreshMediaInfo(LifecycleOwner owner, Media media) {
+    public void refreshMediaInfo(LifecycleOwner owner, Child media) {
         songRepository.getSongLyrics(media).observe(owner, lyricsLiveData::postValue);
     }
 
-    public LiveData<Media> getLiveMedia() {
+    public LiveData<Child> getLiveMedia() {
         return liveMedia;
     }
 
     public void setLiveMedia(LifecycleOwner owner, String mediaType, String mediaId) {
-        if(mediaType != null) {
+        if (mediaType != null) {
             switch (mediaType) {
                 case Media.MEDIA_TYPE_MUSIC:
                     songRepository.getSong(mediaId).observe(owner, liveMedia::postValue);
@@ -95,12 +95,12 @@ public class PlayerBottomSheetViewModel extends AndroidViewModel {
         }
     }
 
-    public LiveData<Artist> getLiveArtist() {
+    public LiveData<ArtistID3> getLiveArtist() {
         return liveArtist;
     }
 
     public void setLiveArtist(LifecycleOwner owner, String mediaType, String ArtistId) {
-        if(mediaType != null) {
+        if (mediaType != null) {
             switch (mediaType) {
                 case Media.MEDIA_TYPE_MUSIC:
                     artistRepository.getArtist(ArtistId).observe(owner, liveArtist::postValue);
@@ -112,7 +112,7 @@ public class PlayerBottomSheetViewModel extends AndroidViewModel {
         }
     }
 
-    public LiveData<List<Media>> getMediaInstantMix(LifecycleOwner owner, Media media) {
+    public LiveData<List<Child>> getMediaInstantMix(LifecycleOwner owner, Child media) {
         instantMix.setValue(Collections.emptyList());
 
         songRepository.getInstantMix(media, 20).observe(owner, instantMix::postValue);
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistCatalogueViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistCatalogueViewModel.java
index 1c727c91..802c1fa1 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistCatalogueViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistCatalogueViewModel.java
@@ -3,18 +3,15 @@ package com.cappielloantonio.play.viewmodel;
 import android.app.Application;
 
 import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
-import com.cappielloantonio.play.App;
-import com.cappielloantonio.play.model.Playlist;
 import com.cappielloantonio.play.repository.DownloadRepository;
 import com.cappielloantonio.play.repository.PlaylistRepository;
-import com.cappielloantonio.play.util.MappingUtil;
-import com.cappielloantonio.play.util.PreferenceUtil;
+import com.cappielloantonio.play.subsonic.models.Playlist;
+import com.cappielloantonio.play.util.Preferences;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,11 +36,12 @@ public class PlaylistCatalogueViewModel extends AndroidViewModel {
         playlistList = new MutableLiveData<>(new ArrayList<>());
 
         switch (type) {
-            case Playlist.ALL:
+            case com.cappielloantonio.play.model.Playlist.ALL:
                 playlistRepository.getPlaylists(false, -1).observe(owner, playlists -> playlistList.postValue(playlists));
                 break;
-            case Playlist.DOWNLOADED:
-                downloadRepository.getLivePlaylist().observe(owner, downloads -> playlistList.setValue(MappingUtil.mapDownloadToPlaylist(downloads)));
+            case com.cappielloantonio.play.model.Playlist.DOWNLOADED:
+                // TODO
+                //downloadRepository.getLivePlaylist().observe(owner, downloads -> playlistList.setValue(MappingUtil.mapDownloadToPlaylist(downloads)));
                 break;
         }
 
@@ -54,13 +52,13 @@ public class PlaylistCatalogueViewModel extends AndroidViewModel {
 
     public LiveData<List<Playlist>> getPinnedPlaylistList(LifecycleOwner owner) {
         pinnedPlaylistList = new MutableLiveData<>(new ArrayList<>());
-        playlistRepository.getPinnedPlaylists(PreferenceUtil.getInstance(App.getInstance()).getServerId()).observe(owner, playlists -> pinnedPlaylistList.postValue(playlists));
+        playlistRepository.getPinnedPlaylists(Preferences.getServerId()).observe(owner, playlists -> pinnedPlaylistList.postValue(playlists));
         return pinnedPlaylistList;
     }
 
     public void unpinPlaylist(List<Playlist> playlists) {
-        if(type.equals(Playlist.ALL)) {
-            for(Playlist playlist: playlists) {
+        if (type.equals(com.cappielloantonio.play.model.Playlist.ALL)) {
+            for (Playlist playlist : playlists) {
                 playlistRepository.delete(playlist);
             }
         }
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistChooserViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistChooserViewModel.java
index 2026efc8..390573c7 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistChooserViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistChooserViewModel.java
@@ -8,9 +8,9 @@ import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
-import com.cappielloantonio.play.model.Media;
-import com.cappielloantonio.play.model.Playlist;
 import com.cappielloantonio.play.repository.PlaylistRepository;
+import com.cappielloantonio.play.subsonic.models.Child;
+import com.cappielloantonio.play.subsonic.models.Playlist;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -20,7 +20,7 @@ public class PlaylistChooserViewModel extends AndroidViewModel {
     private final PlaylistRepository playlistRepository;
 
     private final MutableLiveData<List<Playlist>> playlists = new MutableLiveData<>(null);
-    private Media toAdd;
+    private Child toAdd;
 
     public PlaylistChooserViewModel(@NonNull Application application) {
         super(application);
@@ -37,11 +37,11 @@ public class PlaylistChooserViewModel extends AndroidViewModel {
         playlistRepository.addSongToPlaylist(playlistId, new ArrayList(Collections.singletonList(toAdd.getId())));
     }
 
-    public void setSongToAdd(Media song) {
+    public void setSongToAdd(Child song) {
         toAdd = song;
     }
 
-    public Media getSongToAdd() {
+    public Child getSongToAdd() {
         return toAdd;
     }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistEditorViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistEditorViewModel.java
index ce3903d0..092a5700 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistEditorViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistEditorViewModel.java
@@ -7,9 +7,9 @@ import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
-import com.cappielloantonio.play.model.Playlist;
-import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.repository.PlaylistRepository;
+import com.cappielloantonio.play.subsonic.models.Child;
+import com.cappielloantonio.play.subsonic.models.Playlist;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -21,10 +21,10 @@ public class PlaylistEditorViewModel extends AndroidViewModel {
 
     private final PlaylistRepository playlistRepository;
 
-    private Media toAdd;
+    private Child toAdd;
     private Playlist toEdit;
 
-    private MutableLiveData<List<Media>> songLiveList = new MutableLiveData<>();
+    private MutableLiveData<List<Child>> songLiveList = new MutableLiveData<>();
 
     public PlaylistEditorViewModel(@NonNull Application application) {
         super(application);
@@ -45,11 +45,11 @@ public class PlaylistEditorViewModel extends AndroidViewModel {
         if (toEdit != null) playlistRepository.deletePlaylist(toEdit.getId());
     }
 
-    public Media getSongToAdd() {
+    public Child getSongToAdd() {
         return toAdd;
     }
 
-    public void setSongToAdd(Media song) {
+    public void setSongToAdd(Child song) {
         this.toAdd = song;
     }
 
@@ -67,26 +67,26 @@ public class PlaylistEditorViewModel extends AndroidViewModel {
         }
     }
 
-    public LiveData<List<Media>> getPlaylistSongLiveList() {
+    public LiveData<List<Child>> getPlaylistSongLiveList() {
         return songLiveList;
     }
 
     public void removeFromPlaylistSongLiveList(int position) {
-        List<Media> songs = songLiveList.getValue();
+        List<Child> songs = songLiveList.getValue();
         Objects.requireNonNull(songs).remove(position);
         songLiveList.postValue(songs);
     }
 
-    public void orderPlaylistSongLiveListAfterSwap(List<Media> songs) {
+    public void orderPlaylistSongLiveListAfterSwap(List<Child> songs) {
         songLiveList.postValue(songs);
     }
 
     private ArrayList<String> getPlaylistSongIds() {
-        List<Media> songs = songLiveList.getValue();
+        List<Child> songs = songLiveList.getValue();
         ArrayList<String> ids = new ArrayList<>();
 
         if (songs != null && !songs.isEmpty()) {
-            for (Media song : songs) {
+            for (Child song : songs) {
                 ids.add(song.getId());
             }
         }
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistPageViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistPageViewModel.java
index 2e22544b..4b721644 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistPageViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistPageViewModel.java
@@ -8,13 +8,11 @@ import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
-import com.cappielloantonio.play.App;
-import com.cappielloantonio.play.model.Playlist;
-import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.repository.DownloadRepository;
 import com.cappielloantonio.play.repository.PlaylistRepository;
-import com.cappielloantonio.play.util.MappingUtil;
-import com.cappielloantonio.play.util.PreferenceUtil;
+import com.cappielloantonio.play.subsonic.models.Child;
+import com.cappielloantonio.play.subsonic.models.Playlist;
+import com.cappielloantonio.play.util.Preferences;
 
 import java.util.List;
 
@@ -22,7 +20,7 @@ public class PlaylistPageViewModel extends AndroidViewModel {
     private final PlaylistRepository playlistRepository;
     private final DownloadRepository downloadRepository;
 
-    private MutableLiveData<List<Media>> playlistSongLiveList = new MutableLiveData<>();
+    private MutableLiveData<List<Child>> playlistSongLiveList = new MutableLiveData<>();
 
     private Playlist playlist;
     private boolean isOffline;
@@ -34,9 +32,10 @@ public class PlaylistPageViewModel extends AndroidViewModel {
         downloadRepository = new DownloadRepository(application);
     }
 
-    public LiveData<List<Media>> getPlaylistSongLiveList(LifecycleOwner owner) {
+    public LiveData<List<Child>> getPlaylistSongLiveList(LifecycleOwner owner) {
         if (isOffline) {
-            downloadRepository.getLiveDownloadFromPlaylist(playlist.getId()).observe(owner, downloads -> playlistSongLiveList.postValue(MappingUtil.mapDownloadToMedia(downloads)));
+            // TODO
+            // downloadRepository.getLiveDownloadFromPlaylist(playlist.getId()).observe(owner, downloads -> playlistSongLiveList.postValue(MappingUtil.mapDownloadToMedia(downloads)));
         } else {
             playlistSongLiveList = playlistRepository.getPlaylistSongs(playlist.getId());
         }
@@ -50,7 +49,8 @@ public class PlaylistPageViewModel extends AndroidViewModel {
 
     public void setPlaylist(Playlist playlist) {
         this.playlist = playlist;
-        this.playlist.setServer(PreferenceUtil.getInstance(App.getInstance()).getServerId());
+        // TODO
+        // this.playlist.setServer(Preferences.getServerId());
     }
 
     public void setOffline(boolean offline) {
@@ -63,12 +63,12 @@ public class PlaylistPageViewModel extends AndroidViewModel {
 
     public LiveData<Boolean> isPinned(LifecycleOwner owner) {
         MutableLiveData<Boolean> isPinnedLive = new MutableLiveData<>();
-        playlistRepository.getPinnedPlaylists(PreferenceUtil.getInstance(App.getInstance()).getServerId()).observe(owner, playlists -> isPinnedLive.postValue(playlists.contains(playlist)));
+        playlistRepository.getPinnedPlaylists(Preferences.getServerId()).observe(owner, playlists -> isPinnedLive.postValue(playlists.contains(playlist)));
         return isPinnedLive;
     }
 
     public void setPinned(boolean isNowPinned) {
-        if(isNowPinned) {
+        if (isNowPinned) {
             playlistRepository.insert(playlist);
         } else {
             playlistRepository.delete(playlist);
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/PodcastBottomSheetViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/PodcastBottomSheetViewModel.java
index 29df16fc..644bbe76 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/PodcastBottomSheetViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/PodcastBottomSheetViewModel.java
@@ -1,21 +1,17 @@
 package com.cappielloantonio.play.viewmodel;
 
 import android.app.Application;
-import android.content.Context;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.AndroidViewModel;
 
-import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.repository.PodcastRepository;
-import com.cappielloantonio.play.util.DownloadUtil;
-import com.cappielloantonio.play.util.MappingUtil;
-import com.cappielloantonio.play.util.PreferenceUtil;
+import com.cappielloantonio.play.subsonic.models.PodcastEpisode;
 
 public class PodcastBottomSheetViewModel extends AndroidViewModel {
     private final PodcastRepository podcastRepository;
 
-    private Media podcast;
+    private PodcastEpisode podcast;
 
     public PodcastBottomSheetViewModel(@NonNull Application application) {
         super(application);
@@ -23,11 +19,11 @@ public class PodcastBottomSheetViewModel extends AndroidViewModel {
         podcastRepository = new PodcastRepository(application);
     }
 
-    public Media getPodcast() {
+    public PodcastEpisode getPodcast() {
         return podcast;
     }
 
-    public void setPodcast(Media podcast) {
+    public void setPodcast(PodcastEpisode podcast) {
         this.podcast = podcast;
     }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/RatingViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/RatingViewModel.java
index 68b8f020..820cfae2 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/RatingViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/RatingViewModel.java
@@ -6,21 +6,21 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 
-import com.cappielloantonio.play.model.Album;
-import com.cappielloantonio.play.model.Artist;
-import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.repository.AlbumRepository;
 import com.cappielloantonio.play.repository.ArtistRepository;
 import com.cappielloantonio.play.repository.SongRepository;
+import com.cappielloantonio.play.subsonic.models.AlbumID3;
+import com.cappielloantonio.play.subsonic.models.ArtistID3;
+import com.cappielloantonio.play.subsonic.models.Child;
 
 public class RatingViewModel extends AndroidViewModel {
     private final SongRepository songRepository;
     private final AlbumRepository albumRepository;
     private final ArtistRepository artistRepository;
 
-    private Media song;
-    private Album album;
-    private Artist artist;
+    private Child song;
+    private AlbumID3 album;
+    private ArtistID3 artist;
 
     public RatingViewModel(@NonNull Application application) {
         super(application);
@@ -30,43 +30,43 @@ public class RatingViewModel extends AndroidViewModel {
         artistRepository = new ArtistRepository(application);
     }
 
-    public Media getSong() {
+    public Child getSong() {
         return song;
     }
 
-    public LiveData<Media> getLiveSong() {
+    public LiveData<Child> getLiveSong() {
         return songRepository.getSong(song.getId());
     }
 
-    public void setSong(Media song) {
+    public void setSong(Child song) {
         this.song = song;
         this.album = null;
         this.artist = null;
     }
 
-    public Album getAlbum() {
+    public AlbumID3 getAlbum() {
         return album;
     }
 
-    public LiveData<Album> getLiveAlbum() {
+    public LiveData<AlbumID3> getLiveAlbum() {
         return albumRepository.getAlbum(album.getId());
     }
 
-    public void setAlbum(Album album) {
+    public void setAlbum(AlbumID3 album) {
         this.song = null;
         this.album = album;
         this.artist = null;
     }
 
-    public Artist getArtist() {
+    public ArtistID3 getArtist() {
         return artist;
     }
 
-    public LiveData<Artist> getLiveArtist() {
+    public LiveData<ArtistID3> getLiveArtist() {
         return artistRepository.getArtist(artist.getId());
     }
 
-    public void setArtist(Artist artist) {
+    public void setArtist(ArtistID3 artist) {
         this.song = null;
         this.album = null;
         this.artist = artist;
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/SearchViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/SearchViewModel.java
index be161dde..35deca7a 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/SearchViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/SearchViewModel.java
@@ -6,11 +6,9 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 
-import com.cappielloantonio.play.model.Album;
-import com.cappielloantonio.play.model.Artist;
 import com.cappielloantonio.play.model.RecentSearch;
-import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.repository.SearchingRepository;
+import com.cappielloantonio.play.subsonic.models.SearchResult3;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,16 +38,8 @@ public class SearchViewModel extends AndroidViewModel {
         }
     }
 
-    public LiveData<List<Media>> searchSong(String title) {
-        return searchingRepository.getSearchedSongs(title);
-    }
-
-    public LiveData<List<Album>> searchAlbum(String name) {
-        return searchingRepository.getSearchedAlbums(name);
-    }
-
-    public LiveData<List<Artist>> searchArtist(String name) {
-        return searchingRepository.getSearchedArtists(name);
+    public LiveData<SearchResult3> search(String title) {
+        return searchingRepository.search(title);
     }
 
     public void insertNewSearch(String search) {
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/SongBottomSheetViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/SongBottomSheetViewModel.java
index 135e0e6c..58b91b89 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/SongBottomSheetViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/SongBottomSheetViewModel.java
@@ -10,17 +10,15 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.media3.common.util.UnstableApi;
 
-import com.cappielloantonio.play.model.Album;
-import com.cappielloantonio.play.model.Artist;
-import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.repository.AlbumRepository;
 import com.cappielloantonio.play.repository.ArtistRepository;
 import com.cappielloantonio.play.repository.SongRepository;
-import com.cappielloantonio.play.util.DownloadUtil;
-import com.cappielloantonio.play.util.MappingUtil;
-import com.cappielloantonio.play.util.PreferenceUtil;
+import com.cappielloantonio.play.subsonic.models.AlbumID3;
+import com.cappielloantonio.play.subsonic.models.ArtistID3;
+import com.cappielloantonio.play.subsonic.models.Child;
 
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 @UnstableApi
@@ -29,9 +27,9 @@ public class SongBottomSheetViewModel extends AndroidViewModel {
     private final AlbumRepository albumRepository;
     private final ArtistRepository artistRepository;
 
-    private Media song;
+    private Child song;
 
-    private final MutableLiveData<List<Media>> instantMix = new MutableLiveData<>(null);
+    private final MutableLiveData<List<Child>> instantMix = new MutableLiveData<>(null);
 
     public SongBottomSheetViewModel(@NonNull Application application) {
         super(application);
@@ -41,40 +39,41 @@ public class SongBottomSheetViewModel extends AndroidViewModel {
         artistRepository = new ArtistRepository(application);
     }
 
-    public Media getSong() {
+    public Child getSong() {
         return song;
     }
 
-    public void setSong(Media song) {
+    public void setSong(Child song) {
         this.song = song;
     }
 
     public void setFavorite(Context context) {
-        if (Boolean.TRUE.equals(song.getStarred())) {
+        if (song.getStarred() != null) {
             songRepository.unstar(song.getId());
-            song.setStarred(false);
+            song.setStarred(null);
         } else {
             songRepository.star(song.getId());
-            song.setStarred(true);
+            song.setStarred(new Date());
 
-            if (PreferenceUtil.getInstance(context).isStarredSyncEnabled()) {
+            // TODO
+            /* if (Preferences.isStarredSyncEnabled()) {
                 DownloadUtil.getDownloadTracker(context).download(
                         MappingUtil.mapMediaItem(context, song, false),
                         MappingUtil.mapDownload(song, null, null)
                 );
-            }
+            } */
         }
     }
 
-    public LiveData<Album> getAlbum() {
+    public LiveData<AlbumID3> getAlbum() {
         return albumRepository.getAlbum(song.getAlbumId());
     }
 
-    public LiveData<Artist> getArtist() {
+    public LiveData<ArtistID3> getArtist() {
         return artistRepository.getArtist(song.getArtistId());
     }
 
-    public LiveData<List<Media>> getInstantMix(LifecycleOwner owner, Media media) {
+    public LiveData<List<Child>> getInstantMix(LifecycleOwner owner, Child media) {
         instantMix.setValue(Collections.emptyList());
 
         songRepository.getInstantMix(media, 20).observe(owner, instantMix::postValue);
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/SongListPageViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/SongListPageViewModel.java
index 225e0286..748c1868 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/SongListPageViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/SongListPageViewModel.java
@@ -9,17 +9,18 @@ import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
-import com.cappielloantonio.play.model.Album;
-import com.cappielloantonio.play.model.Artist;
-import com.cappielloantonio.play.model.Genre;
 import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.repository.ArtistRepository;
 import com.cappielloantonio.play.repository.DownloadRepository;
 import com.cappielloantonio.play.repository.SongRepository;
-import com.cappielloantonio.play.util.MappingUtil;
+import com.cappielloantonio.play.subsonic.models.AlbumID3;
+import com.cappielloantonio.play.subsonic.models.ArtistID3;
+import com.cappielloantonio.play.subsonic.models.Child;
+import com.cappielloantonio.play.subsonic.models.Genre;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class SongListPageViewModel extends AndroidViewModel {
     private final SongRepository songRepository;
@@ -29,10 +30,10 @@ public class SongListPageViewModel extends AndroidViewModel {
     public String title;
     public String toolbarTitle;
     public Genre genre;
-    public Artist artist;
-    public Album album;
+    public ArtistID3 artist;
+    public AlbumID3 album;
 
-    private MutableLiveData<List<Media>> songList;
+    private MutableLiveData<List<Child>> songList;
 
     public ArrayList<String> filters = new ArrayList<>();
     public ArrayList<String> filterNames = new ArrayList<>();
@@ -47,12 +48,12 @@ public class SongListPageViewModel extends AndroidViewModel {
         downloadRepository = new DownloadRepository(application);
     }
 
-    public LiveData<List<Media>> getSongList(LifecycleOwner owner) {
+    public LiveData<List<Child>> getSongList(LifecycleOwner owner) {
         songList = new MutableLiveData<>(new ArrayList<>());
 
         switch (title) {
             case Media.BY_GENRE:
-                songList = songRepository.getSongsByGenre(genre.getId());
+                songList = songRepository.getSongsByGenre(genre.getGenre());
                 break;
             case Media.BY_ARTIST:
                 songList = artistRepository.getTopSongs(artist.getName(), 50);
@@ -67,10 +68,10 @@ public class SongListPageViewModel extends AndroidViewModel {
                 songList = songRepository.getStarredSongs(false, -1);
                 break;
             case Media.DOWNLOADED:
-                downloadRepository.getLiveDownload().observe(owner, downloads -> songList.setValue(MappingUtil.mapDownloadToMedia(downloads)));
+                downloadRepository.getLiveDownload().observe(owner, downloads -> songList.setValue(downloads.stream().map(download -> (Child) download).collect(Collectors.toList())));
                 break;
             case Media.FROM_ALBUM:
-                downloadRepository.getLiveDownloadFromAlbum(album.getId()).observe(owner, downloads -> songList.setValue(MappingUtil.mapDownloadToMedia(downloads)));
+                downloadRepository.getLiveDownloadFromAlbum(album.getId()).observe(owner, downloads -> songList.setValue(downloads.stream().map(download -> (Child) download).collect(Collectors.toList())));
                 break;
         }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/StarredSyncViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/StarredSyncViewModel.java
index b2cadf89..ab874cdf 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/StarredSyncViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/StarredSyncViewModel.java
@@ -8,15 +8,15 @@ import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
-import com.cappielloantonio.play.model.Media;
 import com.cappielloantonio.play.repository.SongRepository;
+import com.cappielloantonio.play.subsonic.models.Child;
 
 import java.util.List;
 
 public class StarredSyncViewModel extends AndroidViewModel {
     private final SongRepository songRepository;
 
-    private final MutableLiveData<List<Media>> starredTracks = new MutableLiveData<>(null);
+    private final MutableLiveData<List<Child>> starredTracks = new MutableLiveData<>(null);
 
     public StarredSyncViewModel(@NonNull Application application) {
         super(application);
@@ -24,7 +24,7 @@ public class StarredSyncViewModel extends AndroidViewModel {
         songRepository = new SongRepository(application);
     }
 
-    public LiveData<List<Media>> getStarredTracks(LifecycleOwner owner) {
+    public LiveData<List<Child>> getStarredTracks(LifecycleOwner owner) {
         songRepository.getStarredSongs(false, -1).observe(owner, starredTracks::postValue);
         return starredTracks;
     }