diff --git a/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt b/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt
index bcb1b64f..11c2c6a7 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt
@@ -45,13 +45,13 @@ enum class LiveData : Localizable {
 					TOURNAMENT_FEATURE -> {
 						(countableUsage as CountableUsage).useCount = it.where<Session>().contains(
 							"tournamentFeatures.id",
-							countableUsage.uniqueIdentifier()
+							countableUsage.id
 						).count().toInt()
 					}
 					else -> {
 						(countableUsage as CountableUsage).useCount = it.where<Session>().equalTo(
 							"${relatedEntity.simpleName.decapitalize()}.id",
-							countableUsage.uniqueIdentifier()
+							countableUsage.id
 						).count().toInt()
 					}
 				}
@@ -93,7 +93,7 @@ enum class LiveData : Localizable {
 		}
 
 	fun deleteData(realm: Realm, data: Manageable) {
-		realm.where(this.relatedEntity).equalTo("id", data.uniqueIdentifier()).findAll().deleteAllFromRealm()
+		realm.where(this.relatedEntity).equalTo("id", data.id).findAll().deleteAllFromRealm()
 	}
 
 	fun updateOrCreate(realm: Realm, primaryKey: String?): RealmObject {
diff --git a/app/src/main/java/net/pokeranalytics/android/model/interfaces/Manageable.kt b/app/src/main/java/net/pokeranalytics/android/model/interfaces/Manageable.kt
index fa848ab3..9c160607 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/interfaces/Manageable.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/interfaces/Manageable.kt
@@ -16,7 +16,7 @@ interface Identifiable {
 	/**
 	 * A unique identifier getter
 	 */
-	fun uniqueIdentifier(): String
+	var id: String
 }
 
 /**
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
index 80ee155a..fc2463e3 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
@@ -33,7 +33,7 @@ open class Bankroll(name: String = "") : RealmObject(), Manageable,
     }
 
     @PrimaryKey
-    var id = UUID.randomUUID().toString()
+    override var id = UUID.randomUUID().toString()
 
     // the name of the bankroll
     var name: String = name
@@ -51,10 +51,6 @@ open class Bankroll(name: String = "") : RealmObject(), Manageable,
         return this.name
     }
 
-    override fun uniqueIdentifier(): String {
-        return this.id
-    }
-
     // Row Representable Datasource
     override fun adapterRows(): List<RowRepresentable>? {
         return Bankroll.rowRepresentation
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
index deffc478..2161d591 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
@@ -30,7 +30,7 @@ open class Game : RealmObject(), Manageable, StaticRowRepresentableDataSource, R
 	}
 
 	@PrimaryKey
-	var id = UUID.randomUUID().toString()
+	override var id = UUID.randomUUID().toString()
 
 	// The name of the game
 	var name: String = ""
@@ -45,10 +45,6 @@ open class Game : RealmObject(), Manageable, StaticRowRepresentableDataSource, R
 		return this.name
 	}
 
-	override fun uniqueIdentifier(): String {
-		return this.id
-	}
-
 	override fun adapterRows(): List<RowRepresentable>? {
 		return Game.rowRepresentation
 	}
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt
index de04bfb6..8db529ba 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt
@@ -13,7 +13,7 @@ import java.util.*
 open class Location : RealmObject(), Manageable, RowRepresentable {
 
 	@PrimaryKey
-	var id = UUID.randomUUID().toString()
+	override var id = UUID.randomUUID().toString()
 
 	// The name of the location
 	var name: String = ""
@@ -31,11 +31,6 @@ open class Location : RealmObject(), Manageable, RowRepresentable {
 		return this.name
 	}
 
-	override fun uniqueIdentifier(): String {
-		return this.id
-	}
-
-
 	override fun updateValue(value: Any?, row: RowRepresentable) {
 		when (row) {
 			SimpleRow.NAME -> this.name = value as String? ?: ""
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
index c47c1015..9bb6b4d6 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
@@ -57,7 +57,7 @@ open class Session : RealmObject(), SessionInterface, Manageable, StaticRowRepre
 	}
 
 	@PrimaryKey
-	var id = UUID.randomUUID().toString()
+	override var id = UUID.randomUUID().toString()
 
 	/**
 	 * Indicates the type of session, cash game or tournament
@@ -468,10 +468,6 @@ open class Session : RealmObject(), SessionInterface, Manageable, StaticRowRepre
 	@Ignore
 	override val viewType: Int = RowViewType.ROW_SESSION.ordinal
 
-	override fun uniqueIdentifier(): String {
-		return this.id
-	}
-
 	override fun getDisplayName(): String {
 		return "Session ${this.creationDate}"
 	}
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt
index 5df87c36..e5774dc8 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt
@@ -26,7 +26,7 @@ open class TournamentFeature : RealmObject(), Manageable, StaticRowRepresentable
     }
 
     @PrimaryKey
-    var id = UUID.randomUUID().toString()
+    override var id = UUID.randomUUID().toString()
 
     // The name of the feature
     var name: String = ""
@@ -38,10 +38,6 @@ open class TournamentFeature : RealmObject(), Manageable, StaticRowRepresentable
         return this.name
     }
 
-    override fun uniqueIdentifier(): String {
-        return this.id
-    }
-
     override fun adapterRows(): List<RowRepresentable>? {
         return TournamentFeature.rowRepresentation
     }
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentName.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentName.kt
index 9ac3ef1b..7d149a82 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentName.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentName.kt
@@ -25,7 +25,7 @@ open class TournamentName : RealmObject(), Manageable, StaticRowRepresentableDat
 	}
 
     @PrimaryKey
-    var id = UUID.randomUUID().toString()
+	override var id = UUID.randomUUID().toString()
 
     // The name of the tournament
     var name: String = ""
@@ -34,10 +34,6 @@ open class TournamentName : RealmObject(), Manageable, StaticRowRepresentableDat
 		return this.name
 	}
 
-	override fun uniqueIdentifier(): String {
-		return this.id
-	}
-
 	override fun updateValue(value: Any?, row: RowRepresentable) {
 		when (row) {
 			SimpleRow.NAME -> this.name = value as String? ?: ""
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt
index 6d38817c..91a17662 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt
@@ -25,7 +25,7 @@ open class TransactionType : RealmObject(), Manageable, StaticRowRepresentableDa
     }
 
     @PrimaryKey
-    var id = UUID.randomUUID().toString()
+    override var id = UUID.randomUUID().toString()
 
     // The name of the transaction type
     var name: String = ""
@@ -43,10 +43,6 @@ open class TransactionType : RealmObject(), Manageable, StaticRowRepresentableDa
         return this.name
     }
 
-    override fun uniqueIdentifier(): String {
-        return this.id
-    }
-
     override fun adapterRows(): List<RowRepresentable>? {
         return TransactionType.rowRepresentation
     }
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
index c6492cf2..0cf28008 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
@@ -70,7 +70,7 @@ class DataListFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSourc
 			EditableDataActivity.newInstance(
 				requireContext(),
 				it.ordinal,
-				(row as Manageable).uniqueIdentifier()
+				(row as Manageable).id
 			)
 		}
 	}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
index 245b6dd5..ce7cdcbd 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
@@ -146,7 +146,7 @@ open class EditableDataFragment : PokerAnalyticsFragment(), RowRepresentableDele
 				val item = it.copyToRealmOrUpdate(this.item)
 
 				val uniqueIdentifier = if (item is Identifiable) {
-					item.uniqueIdentifier()
+					item.id
 				} else ""
 
 				finishActivityWithResult(uniqueIdentifier)
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
index 2cf6fd02..c2a4e7c9 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
@@ -175,6 +175,6 @@ class HistoryFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource
 	}
 
 	override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) {
-		SessionActivity.newInstance(requireContext(), sessionId = (row as Manageable).uniqueIdentifier())
+		SessionActivity.newInstance(requireContext(), sessionId = (row as Manageable).id)
 	}
 }
\ No newline at end of file