diff --git a/android/app/build.gradle b/android/app/build.gradle
index 6d58c7a5..bc67ae6f 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -128,7 +128,7 @@ dependencies {
     kapt "androidx.lifecycle:lifecycle-compiler:$versions.lifecycle"
     implementation "android.arch.navigation:navigation-fragment-ktx:$versions.navigation"
     implementation "android.arch.navigation:navigation-ui-ktx:$versions.navigation"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0-alpha03"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$versions.lifecycle_viewmodel_ktx"
 
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin_version"
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/CheckUserCredentialsValidUseCase.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/CheckUserCredentialsValidUseCase.kt
index 6faf5ca2..3f771d34 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/CheckUserCredentialsValidUseCase.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/CheckUserCredentialsValidUseCase.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.Transformations
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.presentation.App
 import ca.etsmtl.applets.etsmobile.extension.isDeviceConnected
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.InfoEtudiantRepository
 import model.Etudiant
 import model.SignetsUserCredentials
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchCourseEvaluationsCompletedUseCase.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchCourseEvaluationsCompletedUseCase.kt
index 54a89dde..c2f014f9 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchCourseEvaluationsCompletedUseCase.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchCourseEvaluationsCompletedUseCase.kt
@@ -2,10 +2,10 @@ package ca.etsmtl.applets.etsmobile.domain
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
-import ca.etsmtl.applets.repository.data.model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.EvaluationCoursRepository
 import model.Cours
 import model.EvaluationCours
+import model.Resource
 import model.SignetsUserCredentials
 import javax.inject.Inject
 
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchCurrentSessionGradesCoursesUseCase.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchCurrentSessionGradesCoursesUseCase.kt
index 9da3c338..71548454 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchCurrentSessionGradesCoursesUseCase.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchCurrentSessionGradesCoursesUseCase.kt
@@ -2,7 +2,7 @@ package ca.etsmtl.applets.etsmobile.domain
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.Cours
 import javax.inject.Inject
 
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchCurrentSessionSeancesUseCase.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchCurrentSessionSeancesUseCase.kt
index 6e527adf..e4f92028 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchCurrentSessionSeancesUseCase.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchCurrentSessionSeancesUseCase.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.Transformations
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.presentation.App
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.SeanceRepository
 import model.Seance
 import model.SignetsUserCredentials
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchCurrentSessionUseCase.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchCurrentSessionUseCase.kt
index 9239595a..5a407cc4 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchCurrentSessionUseCase.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchCurrentSessionUseCase.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.presentation.App
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.SessionRepository
 import ca.etsmtl.applets.repository.util.timeInSeconds
 import model.Session
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchEtudiantUseCase.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchEtudiantUseCase.kt
index 4ab8dac1..d56700d1 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchEtudiantUseCase.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchEtudiantUseCase.kt
@@ -1,7 +1,7 @@
 package ca.etsmtl.applets.etsmobile.domain
 
 import androidx.lifecycle.LiveData
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.InfoEtudiantRepository
 import model.Etudiant
 import model.SignetsUserCredentials
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchFutureSeancesUseCase.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchFutureSeancesUseCase.kt
index 612ae0a9..0b946d5b 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchFutureSeancesUseCase.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchFutureSeancesUseCase.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.Transformations
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.presentation.App
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.Seance
 import model.Session
 import model.SignetsUserCredentials
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchGradesCoursesGroupedBySessionUseCase.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchGradesCoursesGroupedBySessionUseCase.kt
index fde527dc..1699032b 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchGradesCoursesGroupedBySessionUseCase.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchGradesCoursesGroupedBySessionUseCase.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.presentation.App
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.Cours
 import javax.inject.Inject
 
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchGradesCoursesUseCase.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchGradesCoursesUseCase.kt
index 12299e3e..94dfce0d 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchGradesCoursesUseCase.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchGradesCoursesUseCase.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.presentation.App
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.CoursRepository
 import model.Cours
 import model.SignetsUserCredentials
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchGradesDetailsUseCase.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchGradesDetailsUseCase.kt
index c79fdfb8..9eaa8615 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchGradesDetailsUseCase.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchGradesDetailsUseCase.kt
@@ -6,10 +6,10 @@ import androidx.lifecycle.Transformations
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.extension.isDeviceConnected
 import ca.etsmtl.applets.etsmobile.presentation.App
-import ca.etsmtl.applets.repository.data.model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.EvaluationRepository
 import ca.etsmtl.applets.repository.util.replaceCommaAndParseToDouble
 import model.Cours
+import model.Resource
 import model.SignetsUserCredentials
 import model.SommaireEtEvaluations
 import javax.inject.Inject
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchProgrammesUseCase.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchProgrammesUseCase.kt
index c091f775..64c2582e 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchProgrammesUseCase.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchProgrammesUseCase.kt
@@ -1,7 +1,7 @@
 package ca.etsmtl.applets.etsmobile.domain
 
 import androidx.lifecycle.LiveData
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.ProgrammeRepository
 import model.Programme
 import model.SignetsUserCredentials
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchSessionSeancesUseCase.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchSessionSeancesUseCase.kt
index ec9097ed..e27ffd85 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchSessionSeancesUseCase.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchSessionSeancesUseCase.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.presentation.App
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.SeanceRepository
 import model.Seance
 import model.Session
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchSessionsUseCase.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchSessionsUseCase.kt
index 1547cc14..ab6b9aa2 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchSessionsUseCase.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchSessionsUseCase.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.presentation.App
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.SessionRepository
 import model.Session
 import model.SignetsUserCredentials
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchTodaySeancesUseCase.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchTodaySeancesUseCase.kt
index ccb64f3a..bf6a2219 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchTodaySeancesUseCase.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchTodaySeancesUseCase.kt
@@ -3,9 +3,9 @@ package ca.etsmtl.applets.etsmobile.domain
 import androidx.lifecycle.LiveData
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.presentation.App
-import ca.etsmtl.applets.repository.data.model.Resource
 import com.shopify.livedataktx.map
 import com.shopify.livedataktx.nonNull
+import model.Resource
 import model.Seance
 import java.util.Calendar
 import javax.inject.Inject
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/UpdateGradesForCoursesUseCase.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/UpdateGradesForCoursesUseCase.kt
index 46d22c26..9fa0aced 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/UpdateGradesForCoursesUseCase.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/UpdateGradesForCoursesUseCase.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.presentation.App
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.EvaluationRepository
 import model.Cours
 import model.SignetsUserCredentials
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/extension/ResourceExt.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/extension/ResourceExt.kt
index 12ecca0f..ac3f4ecb 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/extension/ResourceExt.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/extension/ResourceExt.kt
@@ -3,7 +3,7 @@ package ca.etsmtl.applets.etsmobile.extension
 import android.content.Context
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.util.Event
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 
 /**
  * Created by Sonphil on 03-11-18.
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/dashboard/DashboardFragment.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/dashboard/DashboardFragment.kt
index e33aa57a..0eef4b32 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/dashboard/DashboardFragment.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/dashboard/DashboardFragment.kt
@@ -125,9 +125,9 @@ class DashboardFragment : DaggerFragment() {
         dashboardViewModel.load()
     }
 
-    override fun onStop() {
+    override fun onPause() {
         dashboardViewModel.save()
 
-        super.onStop()
+        super.onPause()
     }
 }
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/dashboard/card/grades/GradesCardViewModel.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/dashboard/card/grades/GradesCardViewModel.kt
index 88e5c5df..402f72ae 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/dashboard/card/grades/GradesCardViewModel.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/dashboard/card/grades/GradesCardViewModel.kt
@@ -10,8 +10,8 @@ import ca.etsmtl.applets.etsmobile.extension.adjustCoteForDisplay
 import ca.etsmtl.applets.etsmobile.presentation.App
 import ca.etsmtl.applets.etsmobile.util.Event
 import ca.etsmtl.applets.etsmobile.util.RefreshableLiveData
-import ca.etsmtl.applets.repository.data.model.Resource
 import model.Cours
+import model.Resource
 import presentation.ViewModel
 import javax.inject.Inject
 
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/dashboard/card/todayschedule/TodayScheduleCardViewModel.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/dashboard/card/todayschedule/TodayScheduleCardViewModel.kt
index 19f8e766..a52f6ee4 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/dashboard/card/todayschedule/TodayScheduleCardViewModel.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/dashboard/card/todayschedule/TodayScheduleCardViewModel.kt
@@ -4,12 +4,12 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.domain.FetchTodaySeancesUseCase
+import ca.etsmtl.applets.etsmobile.extension.getGenericErrorMessage
 import ca.etsmtl.applets.etsmobile.presentation.App
 import ca.etsmtl.applets.etsmobile.util.Event
-import ca.etsmtl.applets.etsmobile.extension.getGenericErrorMessage
-import ca.etsmtl.applets.repository.data.model.Resource
 import com.shopify.livedataktx.map
 import com.shopify.livedataktx.nonNull
+import model.Resource
 import javax.inject.Inject
 
 /**
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/grades/GradesViewModel.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/grades/GradesViewModel.kt
index fc002815..73aa8a0f 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/grades/GradesViewModel.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/grades/GradesViewModel.kt
@@ -12,10 +12,10 @@ import ca.etsmtl.applets.etsmobile.extension.getGenericErrorMessage
 import ca.etsmtl.applets.etsmobile.presentation.App
 import ca.etsmtl.applets.etsmobile.util.Event
 import ca.etsmtl.applets.etsmobile.util.RefreshableLiveData
-import ca.etsmtl.applets.repository.data.model.Resource
 import com.shopify.livedataktx.map
 import com.shopify.livedataktx.nonNull
 import model.Cours
+import model.Resource
 import javax.inject.Inject
 
 /**
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/gradesdetails/GradesDetailsViewModel.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/gradesdetails/GradesDetailsViewModel.kt
index 0d5e95d4..a1eee39a 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/gradesdetails/GradesDetailsViewModel.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/gradesdetails/GradesDetailsViewModel.kt
@@ -9,11 +9,10 @@ import androidx.lifecycle.Transformations
 import androidx.lifecycle.ViewModel
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.domain.FetchGradesDetailsUseCase
+import ca.etsmtl.applets.etsmobile.extension.toLocalizedString
 import ca.etsmtl.applets.etsmobile.presentation.App
 import ca.etsmtl.applets.etsmobile.util.Event
 import ca.etsmtl.applets.etsmobile.util.RefreshableLiveData
-import ca.etsmtl.applets.etsmobile.extension.toLocalizedString
-import ca.etsmtl.applets.repository.data.model.Resource
 import ca.etsmtl.applets.repository.util.zeroIfNullOrBlank
 import com.shopify.livedataktx.map
 import com.shopify.livedataktx.nonNull
@@ -22,6 +21,7 @@ import com.xwray.groupie.Group
 import com.xwray.groupie.Section
 import model.Cours
 import model.Evaluation
+import model.Resource
 import model.SommaireElementsEvaluation
 import model.SommaireEtEvaluations
 import java.util.Date
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/login/LoginViewModel.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/login/LoginViewModel.kt
index 329f81ab..61e598bc 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/login/LoginViewModel.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/login/LoginViewModel.kt
@@ -15,7 +15,7 @@ import ca.etsmtl.applets.etsmobile.domain.SaveSignetsUserCredentialsUseCase
 import ca.etsmtl.applets.etsmobile.presentation.App
 import ca.etsmtl.applets.etsmobile.util.Event
 import ca.etsmtl.applets.etsmobile.extension.call
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.SignetsUserCredentials
 import model.UniversalCode
 import javax.inject.Inject
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/profile/ProfileViewModel.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/profile/ProfileViewModel.kt
index 30484b09..2dbfd799 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/profile/ProfileViewModel.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/profile/ProfileViewModel.kt
@@ -8,16 +8,16 @@ import androidx.lifecycle.ViewModel
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.domain.FetchEtudiantUseCase
 import ca.etsmtl.applets.etsmobile.domain.FetchProgrammesUseCase
+import ca.etsmtl.applets.etsmobile.extension.getGenericErrorMessage
 import ca.etsmtl.applets.etsmobile.presentation.App
 import ca.etsmtl.applets.etsmobile.util.Event
 import ca.etsmtl.applets.etsmobile.util.RefreshableLiveData
-import ca.etsmtl.applets.etsmobile.extension.getGenericErrorMessage
-import ca.etsmtl.applets.repository.data.model.Resource
 import ca.etsmtl.applets.repository.util.zipResourceTo
 import com.shopify.livedataktx.map
 import com.shopify.livedataktx.nonNull
 import model.Etudiant
 import model.Programme
+import model.Resource
 import javax.inject.Inject
 
 /**
diff --git a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/schedule/ScheduleViewModel.kt b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/schedule/ScheduleViewModel.kt
index 6a0ebfd4..59504aea 100644
--- a/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/schedule/ScheduleViewModel.kt
+++ b/android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/schedule/ScheduleViewModel.kt
@@ -9,14 +9,14 @@ import androidx.lifecycle.OnLifecycleEvent
 import androidx.lifecycle.ViewModel
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.domain.FetchFutureSeancesUseCase
+import ca.etsmtl.applets.etsmobile.extension.getGenericErrorMessage
 import ca.etsmtl.applets.etsmobile.presentation.App
 import ca.etsmtl.applets.etsmobile.util.Event
-import ca.etsmtl.applets.etsmobile.extension.getGenericErrorMessage
 import ca.etsmtl.applets.etsmobile.util.RefreshableLiveData
-import ca.etsmtl.applets.repository.data.model.Resource
-import model.Seance
 import com.shopify.livedataktx.map
 import com.shopify.livedataktx.nonNull
+import model.Resource
+import model.Seance
 import java.util.Calendar
 import javax.inject.Inject
 
diff --git a/android/app/src/test/kotlin/ca/etsmtl/applets/etsmobile/presentation/GradesViewModelTest.kt b/android/app/src/test/kotlin/ca/etsmtl/applets/etsmobile/presentation/GradesViewModelTest.kt
index 98c5a580..5c421e48 100644
--- a/android/app/src/test/kotlin/ca/etsmtl/applets/etsmobile/presentation/GradesViewModelTest.kt
+++ b/android/app/src/test/kotlin/ca/etsmtl/applets/etsmobile/presentation/GradesViewModelTest.kt
@@ -8,7 +8,7 @@ import ca.etsmtl.applets.etsmobile.domain.FetchGradesCoursesGroupedBySessionUseC
 import ca.etsmtl.applets.etsmobile.extension.mockNetwork
 import ca.etsmtl.applets.etsmobile.presentation.grades.GradesViewModel
 import ca.etsmtl.applets.etsmobile.util.Event
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import com.nhaarman.mockito_kotlin.capture
 import com.nhaarman.mockito_kotlin.mock
 import com.nhaarman.mockito_kotlin.verify
diff --git a/android/app/src/test/kotlin/ca/etsmtl/applets/etsmobile/presentation/LoginViewModelTest.kt b/android/app/src/test/kotlin/ca/etsmtl/applets/etsmobile/presentation/LoginViewModelTest.kt
index 55525cf1..48d9b5d5 100644
--- a/android/app/src/test/kotlin/ca/etsmtl/applets/etsmobile/presentation/LoginViewModelTest.kt
+++ b/android/app/src/test/kotlin/ca/etsmtl/applets/etsmobile/presentation/LoginViewModelTest.kt
@@ -11,7 +11,7 @@ import ca.etsmtl.applets.etsmobile.presentation.login.LoginViewModel
 import ca.etsmtl.applets.etsmobile.util.Event
 import ca.etsmtl.applets.etsmobile.util.EventObserver
 import ca.etsmtl.applets.etsmobile.extension.mockNetwork
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import com.nhaarman.mockito_kotlin.any
 import com.nhaarman.mockito_kotlin.capture
 import com.nhaarman.mockito_kotlin.mock
diff --git a/android/app/src/test/kotlin/ca/etsmtl/applets/etsmobile/presentation/ProfileViewModelTest.kt b/android/app/src/test/kotlin/ca/etsmtl/applets/etsmobile/presentation/ProfileViewModelTest.kt
index 2b9a3b6b..57003261 100644
--- a/android/app/src/test/kotlin/ca/etsmtl/applets/etsmobile/presentation/ProfileViewModelTest.kt
+++ b/android/app/src/test/kotlin/ca/etsmtl/applets/etsmobile/presentation/ProfileViewModelTest.kt
@@ -14,7 +14,7 @@ import ca.etsmtl.applets.etsmobile.presentation.profile.ProfileViewModel
 import ca.etsmtl.applets.etsmobile.util.Event
 import ca.etsmtl.applets.etsmobile.util.EventObserver
 import ca.etsmtl.applets.etsmobile.extension.mockNetwork
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import com.nhaarman.mockito_kotlin.any
 import com.nhaarman.mockito_kotlin.capture
 import com.nhaarman.mockito_kotlin.mock
diff --git a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/NetworkBoundResource.kt b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/NetworkBoundResource.kt
index 71f8d926..4444f894 100644
--- a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/NetworkBoundResource.kt
+++ b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/NetworkBoundResource.kt
@@ -22,7 +22,7 @@ import androidx.annotation.MainThread
 import androidx.annotation.WorkerThread
 import ca.etsmtl.applets.repository.AppExecutors
 import ca.etsmtl.applets.repository.data.api.ApiResponse
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 
 /**
  * A generic class that can provide a resource backed by both the sqlite database and the network.
diff --git a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/CoursRepository.kt b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/CoursRepository.kt
index 1aa428d7..9cec3fa4 100644
--- a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/CoursRepository.kt
+++ b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/CoursRepository.kt
@@ -11,7 +11,7 @@ import ca.etsmtl.applets.repository.data.api.response.signets.ApiListeDeCours
 import ca.etsmtl.applets.repository.data.api.response.signets.ApiSignetsModel
 import ca.etsmtl.applets.repository.data.db.dao.signets.CoursDao
 import ca.etsmtl.applets.repository.data.db.entity.mapper.toCours
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.Cours
 import model.SignetsUserCredentials
 import javax.inject.Inject
diff --git a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/EvaluationCoursRepository.kt b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/EvaluationCoursRepository.kt
index 000e3116..fe725e21 100644
--- a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/EvaluationCoursRepository.kt
+++ b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/EvaluationCoursRepository.kt
@@ -11,7 +11,7 @@ import ca.etsmtl.applets.repository.data.api.response.signets.ApiListeEvaluation
 import ca.etsmtl.applets.repository.data.api.response.signets.ApiSignetsModel
 import ca.etsmtl.applets.repository.data.db.dao.signets.EvaluationCoursDao
 import ca.etsmtl.applets.repository.data.db.entity.mapper.toEvaluationCours
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.Cours
 import model.EvaluationCours
 import model.SignetsUserCredentials
diff --git a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/EvaluationRepository.kt b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/EvaluationRepository.kt
index 35b22a69..add00547 100644
--- a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/EvaluationRepository.kt
+++ b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/EvaluationRepository.kt
@@ -15,7 +15,7 @@ import ca.etsmtl.applets.repository.data.db.dao.signets.EvaluationDao
 import ca.etsmtl.applets.repository.data.db.dao.signets.SommaireElementsEvaluationDao
 import ca.etsmtl.applets.repository.data.db.entity.mapper.toEvaluations
 import ca.etsmtl.applets.repository.data.db.entity.mapper.toSommaireEvaluation
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.Cours
 import model.SignetsUserCredentials
 import model.SommaireElementsEvaluation
diff --git a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/HoraireExamenFinalRepository.kt b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/HoraireExamenFinalRepository.kt
index 7e973373..357173b3 100644
--- a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/HoraireExamenFinalRepository.kt
+++ b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/HoraireExamenFinalRepository.kt
@@ -11,7 +11,7 @@ import ca.etsmtl.applets.repository.data.api.response.signets.ApiListeHoraireExa
 import ca.etsmtl.applets.repository.data.api.response.signets.ApiSignetsModel
 import ca.etsmtl.applets.repository.data.db.dao.signets.HoraireExamenFinalDao
 import ca.etsmtl.applets.repository.data.db.entity.mapper.toHorairesExamensFinaux
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.HoraireExamenFinal
 import model.Session
 import model.SignetsUserCredentials
diff --git a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/InfoEtudiantRepository.kt b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/InfoEtudiantRepository.kt
index 0da91291..e5c02e46 100644
--- a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/InfoEtudiantRepository.kt
+++ b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/InfoEtudiantRepository.kt
@@ -11,7 +11,7 @@ import ca.etsmtl.applets.repository.data.api.response.signets.ApiEtudiant
 import ca.etsmtl.applets.repository.data.api.response.signets.ApiSignetsModel
 import ca.etsmtl.applets.repository.data.db.dao.signets.EtudiantDao
 import ca.etsmtl.applets.repository.data.db.entity.mapper.toEtudiant
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.Etudiant
 import model.SignetsUserCredentials
 import javax.inject.Inject
diff --git a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/JourRemplaceRepository.kt b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/JourRemplaceRepository.kt
index 9936bd18..a46352c9 100644
--- a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/JourRemplaceRepository.kt
+++ b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/JourRemplaceRepository.kt
@@ -10,7 +10,7 @@ import ca.etsmtl.applets.repository.data.api.response.signets.ApiListeJoursRempl
 import ca.etsmtl.applets.repository.data.api.response.signets.ApiSignetsModel
 import ca.etsmtl.applets.repository.data.db.dao.signets.JourRemplaceDao
 import ca.etsmtl.applets.repository.data.db.entity.mapper.toJoursRemplaces
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.JourRemplace
 import model.Session
 import javax.inject.Inject
diff --git a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/SeanceRepository.kt b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/SeanceRepository.kt
index b2e2d1e4..b63cebae 100644
--- a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/SeanceRepository.kt
+++ b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/SeanceRepository.kt
@@ -11,7 +11,7 @@ import ca.etsmtl.applets.repository.data.api.response.signets.ApiListeDesSeances
 import ca.etsmtl.applets.repository.data.api.response.signets.ApiSignetsModel
 import ca.etsmtl.applets.repository.data.db.dao.signets.SeanceDao
 import ca.etsmtl.applets.repository.data.db.entity.mapper.toSeances
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.util.unixToDefaultSignetsDate
 import model.Cours
 import model.Seance
diff --git a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/SessionRepository.kt b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/SessionRepository.kt
index 88cb4a41..36f7e914 100644
--- a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/SessionRepository.kt
+++ b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/SessionRepository.kt
@@ -11,7 +11,7 @@ import ca.etsmtl.applets.repository.data.api.response.signets.ApiListeDeSessions
 import ca.etsmtl.applets.repository.data.api.response.signets.ApiSignetsModel
 import ca.etsmtl.applets.repository.data.db.dao.signets.SessionDao
 import ca.etsmtl.applets.repository.data.db.entity.mapper.toSessions
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.Session
 import model.SignetsUserCredentials
 import javax.inject.Inject
diff --git a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/util/LiveDataExt.kt b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/util/LiveDataExt.kt
index 8e426383..fc6cd0ff 100644
--- a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/util/LiveDataExt.kt
+++ b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/util/LiveDataExt.kt
@@ -2,7 +2,7 @@ package ca.etsmtl.applets.repository.util
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 
 /**
  * Created by Sonphil on 01-11-18.
diff --git a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/util/MediatorLiveDataExt.kt b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/util/MediatorLiveDataExt.kt
index 0e8d2e15..1e10cebf 100644
--- a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/util/MediatorLiveDataExt.kt
+++ b/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/util/MediatorLiveDataExt.kt
@@ -2,7 +2,7 @@ package ca.etsmtl.applets.repository.util
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 
 /**
  * Created by Sonphil on 01-11-18.
diff --git a/android/repository/src/test/kotlin/ca/etsmtl/applets/repository/data/LiveDataExtTest.kt b/android/repository/src/test/kotlin/ca/etsmtl/applets/repository/data/LiveDataExtTest.kt
index 9e2f17db..401ad3ba 100644
--- a/android/repository/src/test/kotlin/ca/etsmtl/applets/repository/data/LiveDataExtTest.kt
+++ b/android/repository/src/test/kotlin/ca/etsmtl/applets/repository/data/LiveDataExtTest.kt
@@ -3,7 +3,7 @@ package ca.etsmtl.applets.repository.data
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.util.zipResourceTo
 import ca.etsmtl.applets.repository.util.zipTo
 import com.nhaarman.mockito_kotlin.capture
diff --git a/android/repository/src/test/kotlin/ca/etsmtl/applets/repository/data/repository/CoursRepositoryTest.kt b/android/repository/src/test/kotlin/ca/etsmtl/applets/repository/data/repository/CoursRepositoryTest.kt
index d5483890..72e52059 100644
--- a/android/repository/src/test/kotlin/ca/etsmtl/applets/repository/data/repository/CoursRepositoryTest.kt
+++ b/android/repository/src/test/kotlin/ca/etsmtl/applets/repository/data/repository/CoursRepositoryTest.kt
@@ -15,7 +15,7 @@ import ca.etsmtl.applets.repository.data.db.entity.mapper.toCours
 import ca.etsmtl.applets.repository.data.db.entity.signets.CoursEntity
 import ca.etsmtl.applets.repository.data.db.entity.signets.CoursEntityAndNoteSur100
 import ca.etsmtl.applets.repository.data.db.entity.signets.SommaireElementsEvaluationEntity
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.CoursRepository
 import ca.etsmtl.applets.repository.util.ApiUtil
 import ca.etsmtl.applets.repository.util.InstantAppExecutors
diff --git a/android/repository/src/test/kotlin/ca/etsmtl/applets/repository/data/repository/NetworkBoundResourceTest.kt b/android/repository/src/test/kotlin/ca/etsmtl/applets/repository/data/repository/NetworkBoundResourceTest.kt
index 6e9c2b24..1a5f5c24 100644
--- a/android/repository/src/test/kotlin/ca/etsmtl/applets/repository/data/repository/NetworkBoundResourceTest.kt
+++ b/android/repository/src/test/kotlin/ca/etsmtl/applets/repository/data/repository/NetworkBoundResourceTest.kt
@@ -21,7 +21,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
 import ca.etsmtl.applets.repository.data.api.ApiResponse
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.util.ApiUtil
 import ca.etsmtl.applets.repository.util.CountingAppExecutors
 import ca.etsmtl.applets.repository.util.InstantAppExecutors
diff --git a/build.gradle b/build.gradle
index 7285704e..e0489a4c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,10 @@
 buildscript {
     ext.versions = [
-            "astl": "1.0.1",
             "buglife": "1.4.3",
             "chuck": "1.1.0",
-            "constraint_layout": "2.0.0-alpha3",
+            "constraint_layout": "2.0.0-alpha4",
             "coroutines": "1.1.1",
-            "dagger": "2.22",
+            "dagger": "2.22.1",
             "dimens": "1.4",
             "espresso": "3.1.2-alpha01",
             "firebase": "16.0.8",
@@ -18,9 +17,10 @@ buildscript {
             "junit": "4.12",
             "klock": "1.1.1",
             "kotlin": "1.3.21",
-            "kotlinx_serialization": "0.10.0",
+            "kotlinx_serialization": "0.11.0",
             "leakcanary": "1.6.3",
             "lifecycle": "2.0.0",
+            "lifecycle_viewmodel_ktx": "2.1.0-alpha04",
             "materialprogressview": "1.0.6",
             "mockito": "2.23.4",
             "mockito_kotlin": "1.6.0",
diff --git a/shared/build.gradle b/shared/build.gradle
index 37fafcd6..60edf50f 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -41,7 +41,7 @@ kotlin {
                 api "com.soywiz:klock:$versions.klock"
                 api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$versions.coroutines"
                 implementation "androidx.lifecycle:lifecycle-extensions:$versions.lifecycle"
-                implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0-alpha02"
+                implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$versions.lifecycle_viewmodel_ktx"
                 implementation "javax.inject:javax.inject:1"
             }
         }
diff --git a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/model/Resource.kt b/shared/src/commonMain/kotlin/model/Resource.kt
similarity index 93%
rename from android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/model/Resource.kt
rename to shared/src/commonMain/kotlin/model/Resource.kt
index 5440ecd6..11f10220 100644
--- a/android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/model/Resource.kt
+++ b/shared/src/commonMain/kotlin/model/Resource.kt
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package ca.etsmtl.applets.repository.data.model
+package model
 
 class Resource<T> private constructor(val status: Status, val data: T?, val message: String?) {
     enum class Status {
@@ -38,10 +38,6 @@ class Resource<T> private constructor(val status: Status, val data: T?, val mess
             return true
         }
 
-        if (other == null || javaClass != other.javaClass) {
-            return false
-        }
-
         val res = other as Resource<*>
 
         if (status != res.status) {