diff --git a/android-sample.iml b/android-sample.iml
index 2a02201..617308e 100644
--- a/android-sample.iml
+++ b/android-sample.iml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="android-sample" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
         <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <output url="file://$MODULE_DIR$/build/classes/main" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
@@ -17,5 +18,4 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index f67e8a7..6d8fdb1 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -11,80 +11,113 @@
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <afterSyncTasks>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundle_manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/duplicate_classes_check" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/external_libs_dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_jni_libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/metadata_feature_manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/validate_signing_config" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="deezer-sdk-unspecified" level="project" />
-    <orderEntry type="library" exported="" name="picasso-2.4.0" level="project" />
+    <orderEntry type="library" name="Gradle: artifacts:deezer-sdk:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.picasso:picasso:2.4.0@jar" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 8c539a9..ee943ca 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 29
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "com.deezer.sdk.sample"
 
-        minSdkVersion 8
-        targetSdkVersion 21
+        minSdkVersion 14
+        targetSdkVersion 29
 
         versionCode 1
         versionName "1.0"
@@ -28,6 +28,6 @@ android {
 }
 
 dependencies {
-    compile 'com.squareup.picasso:picasso:2.4.0'
-    compile project(':deezer-sdk')
+    implementation 'com.squareup.picasso:picasso:2.4.0'
+    implementation project(':deezer-sdk')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7135071..0c79e9d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,10 +19,13 @@
 
     <application
         android:allowBackup="true"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/DeezerDemoTheme">
 
+        <uses-library android:name="org.apache.http.legacy" android:required="false" />
+
         <!-- Main activity -->
         <activity
             android:name=".LoginActivity"
diff --git a/app/src/main/java/com/deezer/sdk/sample/EqualizerActivity.java b/app/src/main/java/com/deezer/sdk/sample/EqualizerActivity.java
index ae79160..051769f 100644
--- a/app/src/main/java/com/deezer/sdk/sample/EqualizerActivity.java
+++ b/app/src/main/java/com/deezer/sdk/sample/EqualizerActivity.java
@@ -9,10 +9,10 @@
 import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.Toast;
 
+import com.deezer.sdk.model.PlayableEntity;
 import com.deezer.sdk.model.Track;
 import com.deezer.sdk.network.connect.SessionStore;
 import com.deezer.sdk.network.request.event.DeezerError;
-import com.deezer.sdk.network.request.event.OAuthException;
 import com.deezer.sdk.player.RadioPlayer;
 import com.deezer.sdk.player.RadioPlayer.RadioType;
 import com.deezer.sdk.player.event.RadioPlayerListener;
@@ -107,9 +107,6 @@ private void createPlayer() {
             mRadioPlayer.addPlayerListener(this);
             setAttachedPlayer(mRadioPlayer);
         }
-        catch (OAuthException e) {
-            handleError(e);
-        }
         catch (DeezerError e) {
             handleError(e);
         }
@@ -155,7 +152,9 @@ public void onStopTrackingTouch(final SeekBar seekBar) {
     
     
     @Override
-    public void onPlayTrack(final Track track) {
+    public void onPlayTrack(PlayableEntity playableEntity) {
+        Track track = (Track) playableEntity;
+
         displayTrack(track);
         
         mEqualizer = new Equalizer(0, mRadioPlayer.getAudioSessionId());
@@ -187,7 +186,7 @@ public void onPlayTrack(final Track track) {
         
     }
     @Override
-    public void onTrackEnded(final Track track) {
+    public void onTrackEnded(PlayableEntity playableEntity) {
     }
     
     @Override
diff --git a/app/src/main/java/com/deezer/sdk/sample/LoginActivity.java b/app/src/main/java/com/deezer/sdk/sample/LoginActivity.java
index 9ceba0b..2b70b71 100644
--- a/app/src/main/java/com/deezer/sdk/sample/LoginActivity.java
+++ b/app/src/main/java/com/deezer/sdk/sample/LoginActivity.java
@@ -27,7 +27,8 @@ public class LoginActivity extends BaseActivity {
      * cf : http://developers.deezer.com/api/permissions
      */
     protected static final String[] PERMISSIONS = new String[]{
-            Permissions.BASIC_ACCESS, Permissions.OFFLINE_ACCESS
+            Permissions.BASIC_ACCESS,
+            Permissions.OFFLINE_ACCESS
     };
 
 
diff --git a/app/src/main/java/com/deezer/sdk/sample/RadiosActivity.java b/app/src/main/java/com/deezer/sdk/sample/RadiosActivity.java
index 16c0426..313e60b 100644
--- a/app/src/main/java/com/deezer/sdk/sample/RadiosActivity.java
+++ b/app/src/main/java/com/deezer/sdk/sample/RadiosActivity.java
@@ -6,6 +6,7 @@
 import android.widget.ExpandableListView.OnChildClickListener;
 import android.widget.Toast;
 
+import com.deezer.sdk.model.PlayableEntity;
 import com.deezer.sdk.model.Radio;
 import com.deezer.sdk.model.RadioCategory;
 import com.deezer.sdk.model.Track;
@@ -14,7 +15,6 @@
 import com.deezer.sdk.network.request.DeezerRequest;
 import com.deezer.sdk.network.request.DeezerRequestFactory;
 import com.deezer.sdk.network.request.event.DeezerError;
-import com.deezer.sdk.network.request.event.OAuthException;
 import com.deezer.sdk.network.request.event.RadioCategoriesRequestListener;
 import com.deezer.sdk.player.RadioPlayer;
 import com.deezer.sdk.player.RadioPlayer.RadioType;
@@ -81,8 +81,6 @@ private void createPlayer() {
                     new WifiAndMobileNetworkStateChecker());
             mRadioPlayer.addPlayerListener(this);
             setAttachedPlayer(mRadioPlayer);
-        } catch (OAuthException e) {
-            handleError(e);
         } catch (DeezerError e) {
             handleError(e);
         } catch (TooManyPlayersExceptions e) {
@@ -178,12 +176,12 @@ public void onException(final Exception exception,
 
 
     @Override
-    public void onPlayTrack(final Track track) {
-        displayTrack(track);
+    public void onPlayTrack(PlayableEntity playableEntity) {
+        displayTrack((Track) playableEntity);
     }
 
     @Override
-    public void onTrackEnded(final Track track) {
+    public void onTrackEnded(PlayableEntity playableEntity) {
     }
 
     @Override
diff --git a/app/src/main/java/com/deezer/sdk/sample/UserAlbumsActivity.java b/app/src/main/java/com/deezer/sdk/sample/UserAlbumsActivity.java
index 44d83bc..4d1d3c3 100644
--- a/app/src/main/java/com/deezer/sdk/sample/UserAlbumsActivity.java
+++ b/app/src/main/java/com/deezer/sdk/sample/UserAlbumsActivity.java
@@ -18,13 +18,13 @@
 
 import com.deezer.sdk.model.AImageOwner.ImageSize;
 import com.deezer.sdk.model.Album;
+import com.deezer.sdk.model.PlayableEntity;
 import com.deezer.sdk.model.Track;
 import com.deezer.sdk.network.connect.SessionStore;
 import com.deezer.sdk.network.request.DeezerRequest;
 import com.deezer.sdk.network.request.DeezerRequestFactory;
 import com.deezer.sdk.network.request.event.DeezerError;
 import com.deezer.sdk.network.request.event.JsonRequestListener;
-import com.deezer.sdk.network.request.event.OAuthException;
 import com.deezer.sdk.player.AlbumPlayer;
 import com.deezer.sdk.player.event.PlayerWrapperListener;
 import com.deezer.sdk.player.exception.TooManyPlayersExceptions;
@@ -119,9 +119,6 @@ private void createPlayer() {
             mAlbumPlayer.addPlayerListener(this);
             setAttachedPlayer(mAlbumPlayer);
         }
-        catch (OAuthException e) {
-            handleError(e);
-        }
         catch (TooManyPlayersExceptions e) {
             handleError(e);
         }
@@ -190,12 +187,12 @@ protected void onSkipToPreviousTrack() {
     //////////////////////////////////////////////////////////////////////////////////////
     
     @Override
-    public void onPlayTrack(final Track track) {
-        displayTrack(track);
+    public void onPlayTrack(PlayableEntity playableEntity) {
+        displayTrack((Track) playableEntity);
     }
     
     @Override
-    public void onTrackEnded(final Track track) {
+    public void onTrackEnded(PlayableEntity playableEntity) {
     }
     
     @Override
diff --git a/app/src/main/java/com/deezer/sdk/sample/UserArtistsActivity.java b/app/src/main/java/com/deezer/sdk/sample/UserArtistsActivity.java
index c6d330f..1dd8abd 100644
--- a/app/src/main/java/com/deezer/sdk/sample/UserArtistsActivity.java
+++ b/app/src/main/java/com/deezer/sdk/sample/UserArtistsActivity.java
@@ -17,6 +17,7 @@
 import android.widget.Toast;
 
 import com.deezer.sdk.model.Artist;
+import com.deezer.sdk.model.PlayableEntity;
 import com.deezer.sdk.model.Track;
 import com.deezer.sdk.model.AImageOwner.ImageSize;
 import com.deezer.sdk.network.connect.SessionStore;
@@ -25,7 +26,6 @@
 import com.deezer.sdk.network.request.DeezerRequestFactory;
 import com.deezer.sdk.network.request.event.DeezerError;
 import com.deezer.sdk.network.request.event.JsonRequestListener;
-import com.deezer.sdk.network.request.event.OAuthException;
 import com.deezer.sdk.player.ArtistRadioPlayer;
 import com.deezer.sdk.player.event.RadioPlayerListener;
 import com.deezer.sdk.player.exception.TooManyPlayersExceptions;
@@ -136,9 +136,6 @@ private void createPlayer() {
             mArtistPlayer.addPlayerListener(this);
             setAttachedPlayer(mArtistPlayer);
         }
-        catch (OAuthException e) {
-            handleError(e);
-        }
         catch (TooManyPlayersExceptions e) {
             handleError(e);
         }
@@ -209,12 +206,12 @@ public void onTooManySkipsException() {
     }
     
     @Override
-    public void onPlayTrack(final Track track) {
-        displayTrack(track);
+    public void onPlayTrack(PlayableEntity playableEntity) {
+        displayTrack((Track) playableEntity);
     }
     
     @Override
-    public void onTrackEnded(final Track track) {
+    public void onTrackEnded(PlayableEntity playableEntity) {
     }
     
     @Override
diff --git a/app/src/main/java/com/deezer/sdk/sample/UserCustomTrackListActivity.java b/app/src/main/java/com/deezer/sdk/sample/UserCustomTrackListActivity.java
index b8a62f0..a6ef95e 100644
--- a/app/src/main/java/com/deezer/sdk/sample/UserCustomTrackListActivity.java
+++ b/app/src/main/java/com/deezer/sdk/sample/UserCustomTrackListActivity.java
@@ -5,10 +5,10 @@
 
 import android.os.Bundle;
 
+import com.deezer.sdk.model.PlayableEntity;
 import com.deezer.sdk.model.Track;
 import com.deezer.sdk.network.connect.SessionStore;
 import com.deezer.sdk.network.request.event.DeezerError;
-import com.deezer.sdk.network.request.event.OAuthException;
 import com.deezer.sdk.player.CustomTrackListPlayer;
 import com.deezer.sdk.player.event.PlayerWrapperListener;
 import com.deezer.sdk.player.exception.TooManyPlayersExceptions;
@@ -73,9 +73,6 @@ private void createPlayer() {
             mCustomPlayer.addPlayerListener(this);
             setAttachedPlayer(mCustomPlayer);
         }
-        catch (OAuthException e) {
-            handleError(e);
-        }
         catch (TooManyPlayersExceptions e) {
             handleError(e);
         }
@@ -108,12 +105,12 @@ private void playTrackList() {
     //////////////////////////////////////////////////////////////////////////////////////
     
     @Override
-    public void onPlayTrack(final Track track) {
-        displayTrack(track);
+    public void onPlayTrack(PlayableEntity playableEntity) {
+        displayTrack((Track) playableEntity);
     }
     
     @Override
-    public void onTrackEnded(final Track track) {
+    public void onTrackEnded(PlayableEntity playableEntity) {
     }
     
     @Override
diff --git a/app/src/main/java/com/deezer/sdk/sample/UserFlowActivity.java b/app/src/main/java/com/deezer/sdk/sample/UserFlowActivity.java
index 7c91717..6c8efcb 100644
--- a/app/src/main/java/com/deezer/sdk/sample/UserFlowActivity.java
+++ b/app/src/main/java/com/deezer/sdk/sample/UserFlowActivity.java
@@ -3,6 +3,7 @@
 import android.os.Bundle;
 import android.widget.Toast;
 
+import com.deezer.sdk.model.PlayableEntity;
 import com.deezer.sdk.model.Track;
 import com.deezer.sdk.model.User;
 import com.deezer.sdk.network.connect.SessionStore;
@@ -11,7 +12,6 @@
 import com.deezer.sdk.network.request.DeezerRequestFactory;
 import com.deezer.sdk.network.request.event.DeezerError;
 import com.deezer.sdk.network.request.event.JsonRequestListener;
-import com.deezer.sdk.network.request.event.OAuthException;
 import com.deezer.sdk.player.RadioPlayer;
 import com.deezer.sdk.player.RadioPlayer.RadioType;
 import com.deezer.sdk.player.event.RadioPlayerListener;
@@ -84,9 +84,6 @@ private void createPlayer() {
             mRadioPlayer.addPlayerListener(this);
             setAttachedPlayer(mRadioPlayer);
         }
-        catch (OAuthException e) {
-            handleError(e);
-        }
         catch (DeezerError e) {
             handleError(e);
         }
@@ -122,12 +119,12 @@ private void setupPlayerUI() {
     //////////////////////////////////////////////////////////////////////////////////////
     
     @Override
-    public void onPlayTrack(final Track track) {
-        displayTrack(track);
+    public void onPlayTrack(PlayableEntity playableEntity) {
+        displayTrack((Track) playableEntity);
     }
     
     @Override
-    public void onTrackEnded(final Track track) {
+    public void onTrackEnded(PlayableEntity playableEntity) {
     }
     
     @Override
diff --git a/app/src/main/java/com/deezer/sdk/sample/UserPlaylistsActivity.java b/app/src/main/java/com/deezer/sdk/sample/UserPlaylistsActivity.java
index 188aa5a..ebf302f 100644
--- a/app/src/main/java/com/deezer/sdk/sample/UserPlaylistsActivity.java
+++ b/app/src/main/java/com/deezer/sdk/sample/UserPlaylistsActivity.java
@@ -20,6 +20,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.deezer.sdk.model.PlayableEntity;
 import com.deezer.sdk.model.Playlist;
 import com.deezer.sdk.model.Track;
 import com.deezer.sdk.network.connect.SessionStore;
@@ -28,7 +29,6 @@
 import com.deezer.sdk.network.request.DeezerRequestFactory;
 import com.deezer.sdk.network.request.event.DeezerError;
 import com.deezer.sdk.network.request.event.JsonRequestListener;
-import com.deezer.sdk.network.request.event.OAuthException;
 import com.deezer.sdk.player.PlaylistPlayer;
 import com.deezer.sdk.player.event.OnPlayerProgressListener;
 import com.deezer.sdk.player.event.PlayerWrapperListener;
@@ -157,9 +157,6 @@ private void createPlayer() {
             mPlaylistPlayer.addOnPlayerProgressListener(this);
             setAttachedPlayer(mPlaylistPlayer);
         }
-        catch (OAuthException e) {
-            handleError(e);
-        }
         catch (TooManyPlayersExceptions e) {
             handleError(e);
         }
@@ -230,15 +227,15 @@ protected void onSkipToPreviousTrack() {
     //////////////////////////////////////////////////////////////////////////////////////
     
     @Override
-    public void onPlayTrack(final Track track) {
-        displayTrack(track);
+    public void onPlayTrack(PlayableEntity playableEntity) {
+        displayTrack((Track) playableEntity);
         if (mOption == Option.fade_in_out) {
             applyFadeInOut(0);
         }
     }
     
     @Override
-    public void onTrackEnded(final Track track) {
+    public void onTrackEnded(PlayableEntity playableEntity) {
     }
     
     @Override
diff --git a/app/src/main/java/com/deezer/sdk/sample/UserRadiosActivity.java b/app/src/main/java/com/deezer/sdk/sample/UserRadiosActivity.java
index 9653af0..73a8258 100644
--- a/app/src/main/java/com/deezer/sdk/sample/UserRadiosActivity.java
+++ b/app/src/main/java/com/deezer/sdk/sample/UserRadiosActivity.java
@@ -16,6 +16,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.deezer.sdk.model.PlayableEntity;
 import com.deezer.sdk.model.Radio;
 import com.deezer.sdk.model.Track;
 import com.deezer.sdk.network.connect.SessionStore;
@@ -24,7 +25,6 @@
 import com.deezer.sdk.network.request.DeezerRequestFactory;
 import com.deezer.sdk.network.request.event.DeezerError;
 import com.deezer.sdk.network.request.event.JsonRequestListener;
-import com.deezer.sdk.network.request.event.OAuthException;
 import com.deezer.sdk.player.RadioPlayer;
 import com.deezer.sdk.player.event.RadioPlayerListener;
 import com.deezer.sdk.player.exception.TooManyPlayersExceptions;
@@ -81,9 +81,6 @@ private void createPlayer() {
             mRadioPlayer.addPlayerListener(this);
             setAttachedPlayer(mRadioPlayer);
         }
-        catch (OAuthException e) {
-            handleError(e);
-        }
         catch (DeezerError e) {
             handleError(e);
         }
@@ -207,12 +204,12 @@ public void onException(final Exception exception,
     
     
     @Override
-    public void onPlayTrack(final Track track) {
-        displayTrack(track);
+    public void onPlayTrack(PlayableEntity playableEntity) {
+        displayTrack((Track) playableEntity);
     }
     
     @Override
-    public void onTrackEnded(final Track track) {
+    public void onTrackEnded(PlayableEntity playableEntity) {
     }
     
     @Override
diff --git a/app/src/main/java/com/deezer/sdk/sample/UserTopTracksActivity.java b/app/src/main/java/com/deezer/sdk/sample/UserTopTracksActivity.java
index 8af64ce..ef9b1a9 100644
--- a/app/src/main/java/com/deezer/sdk/sample/UserTopTracksActivity.java
+++ b/app/src/main/java/com/deezer/sdk/sample/UserTopTracksActivity.java
@@ -15,6 +15,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.deezer.sdk.model.PlayableEntity;
 import com.deezer.sdk.model.Track;
 import com.deezer.sdk.network.connect.SessionStore;
 import com.deezer.sdk.network.request.AsyncDeezerTask;
@@ -22,7 +23,6 @@
 import com.deezer.sdk.network.request.DeezerRequestFactory;
 import com.deezer.sdk.network.request.event.DeezerError;
 import com.deezer.sdk.network.request.event.JsonRequestListener;
-import com.deezer.sdk.network.request.event.OAuthException;
 import com.deezer.sdk.player.TrackPlayer;
 import com.deezer.sdk.player.event.PlayerWrapperListener;
 import com.deezer.sdk.player.exception.TooManyPlayersExceptions;
@@ -124,9 +124,6 @@ private void createPlayer() {
             mTrackPlayer.addPlayerListener(this);
             setAttachedPlayer(mTrackPlayer);
         }
-        catch (OAuthException e) {
-            handleError(e);
-        }
         catch (TooManyPlayersExceptions e) {
             handleError(e);
         }
@@ -186,12 +183,12 @@ public void onException(final Exception exception,
     //////////////////////////////////////////////////////////////////////////////////////
     
     @Override
-    public void onPlayTrack(final Track track) {
-        displayTrack(track);
+    public void onPlayTrack(PlayableEntity playableEntity) {
+        displayTrack((Track) playableEntity);
     }
     
     @Override
-    public void onTrackEnded(final Track track) {
+    public void onTrackEnded(PlayableEntity playableEntity) {
     }
     
     @Override
diff --git a/app/src/main/java/com/deezer/sdk/sample/VisualizerActivity.java b/app/src/main/java/com/deezer/sdk/sample/VisualizerActivity.java
index 8d2c4b2..79d37c1 100644
--- a/app/src/main/java/com/deezer/sdk/sample/VisualizerActivity.java
+++ b/app/src/main/java/com/deezer/sdk/sample/VisualizerActivity.java
@@ -9,10 +9,10 @@
 import android.view.View;
 import android.widget.Toast;
 
+import com.deezer.sdk.model.PlayableEntity;
 import com.deezer.sdk.model.Track;
 import com.deezer.sdk.network.connect.SessionStore;
 import com.deezer.sdk.network.request.event.DeezerError;
-import com.deezer.sdk.network.request.event.OAuthException;
 import com.deezer.sdk.player.RadioPlayer;
 import com.deezer.sdk.player.RadioPlayer.RadioType;
 import com.deezer.sdk.player.event.RadioPlayerListener;
@@ -122,8 +122,6 @@ private void createPlayer() {
                     new WifiAndMobileNetworkStateChecker());
             mRadioPlayer.addPlayerListener(this);
             setAttachedPlayer(mRadioPlayer);
-        } catch (OAuthException e) {
-            handleError(e);
         } catch (DeezerError e) {
             handleError(e);
         } catch (TooManyPlayersExceptions e) {
@@ -138,7 +136,9 @@ private void createPlayer() {
 
 
     @Override
-    public void onPlayTrack(final Track track) {
+    public void onPlayTrack(PlayableEntity playableEntity) {
+        Track track = (Track) playableEntity;
+
         displayTrack(track);
 
         stopVisualizer();
@@ -176,7 +176,7 @@ public void onPlayTrack(final Track track) {
     }
 
     @Override
-    public void onTrackEnded(final Track track) {
+    public void onTrackEnded(PlayableEntity playableEntity) {
         stopVisualizer();
     }
 
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..0d83fed
--- /dev/null
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">deezer.com</domain>
+    </domain-config>
+</network-security-config>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 6356aab..38002ef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:3.4.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/deezer-sdk/build.gradle b/deezer-sdk/build.gradle
index 41c6e56..b6ddf08 100644
--- a/deezer-sdk/build.gradle
+++ b/deezer-sdk/build.gradle
@@ -1,2 +1,2 @@
 configurations.create("default")
-artifacts.add("default", file('deezer-sdk-0.10.17.aar'))
\ No newline at end of file
+artifacts.add("default", file('deezer-sdk-0.11.2.aar'))
\ No newline at end of file
diff --git a/deezer-sdk/deezer-sdk-0.11.2.aar b/deezer-sdk/deezer-sdk-0.11.2.aar
new file mode 100644
index 0000000..0ce8168
Binary files /dev/null and b/deezer-sdk/deezer-sdk-0.11.2.aar differ
diff --git a/deezer-sdk/deezer-sdk.iml b/deezer-sdk/deezer-sdk.iml
index d934fef..aeefb72 100644
--- a/deezer-sdk/deezer-sdk.iml
+++ b/deezer-sdk/deezer-sdk.iml
@@ -1,16 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":deezer-sdk" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":deezer-sdk" />
       </configuration>
     </facet>
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c71e76..53f72d7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Thu Jul 04 13:58:30 BRT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip