diff --git a/Example/MuslimData.xcodeproj/project.pbxproj b/Example/MuslimData.xcodeproj/project.pbxproj
index e44d3d7..96d43d0 100755
--- a/Example/MuslimData.xcodeproj/project.pbxproj
+++ b/Example/MuslimData.xcodeproj/project.pbxproj
@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		2D110EDE216BE7FB002035FA /* PrayerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D110EDD216BE7FB002035FA /* PrayerTests.swift */; };
+		2D1D63A32B9CCF2100DBC74B /* MIGRATION_GUIDE.md in Resources */ = {isa = PBXBuildFile; fileRef = 2D1D63A22B9CCF2100DBC74B /* MIGRATION_GUIDE.md */; };
 		2D27AC4B2188E621004722BD /* LocationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D27AC4A2188E621004722BD /* LocationViewController.swift */; };
 		2D4558BA21694A5200A08DAF /* LocationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D4558B921694A5200A08DAF /* LocationTests.swift */; };
 		2D4EC4D42B835D7C00F08DCB /* IQCityMapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D4EC4D32B835D7C00F08DCB /* IQCityMapperTests.swift */; };
@@ -41,6 +42,7 @@
 /* Begin PBXFileReference section */
 		1FA7CF45010583A8DE450B74 /* Pods-MuslimData_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MuslimData_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MuslimData_Example/Pods-MuslimData_Example.debug.xcconfig"; sourceTree = "<group>"; };
 		2D110EDD216BE7FB002035FA /* PrayerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrayerTests.swift; sourceTree = "<group>"; };
+		2D1D63A22B9CCF2100DBC74B /* MIGRATION_GUIDE.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = MIGRATION_GUIDE.md; path = ../MIGRATION_GUIDE.md; sourceTree = "<group>"; };
 		2D27AC4A2188E621004722BD /* LocationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationViewController.swift; sourceTree = "<group>"; };
 		2D4558B921694A5200A08DAF /* LocationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationTests.swift; sourceTree = "<group>"; };
 		2D4EC4D32B835D7C00F08DCB /* IQCityMapperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IQCityMapperTests.swift; sourceTree = "<group>"; };
@@ -235,6 +237,7 @@
 			children = (
 				CBF44BC9BD957BA32BBAB0D7 /* MuslimData.podspec */,
 				E0705505FB7482A035EE85A3 /* README.md */,
+				2D1D63A22B9CCF2100DBC74B /* MIGRATION_GUIDE.md */,
 				C7F9702CA1CFE6102812811C /* LICENSE */,
 			);
 			name = "Podspec Metadata";
@@ -330,6 +333,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				2D1D63A32B9CCF2100DBC74B /* MIGRATION_GUIDE.md in Resources */,
 				607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */,
 				607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */,
 				607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */,
@@ -363,7 +367,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if which swiftlint >/dev/null; then\n    swiftlint\nelse\n    echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
+			shellScript = "if [[ \"$(uname -m)\" == arm64 ]]; then\n    export PATH=\"/opt/homebrew/bin:$PATH\"\nfi\n\nif which swiftlint > /dev/null; then\n  swiftlint\nelse\n  echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
 		};
 		2DABCDEA216296CC008F4B9B /* SwiftFormat */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -382,7 +386,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if which swiftformat >/dev/null; then\n    swiftformat ../MuslimData\nelse\n    echo \"warning: SwiftFormat not installed, download from https://github.com/nicklockwood/SwiftFormat\"\nfi\n";
+			shellScript = "if [[ \"$(uname -m)\" == arm64 ]]; then\n    export PATH=\"/opt/homebrew/bin:$PATH\"\nfi\n\nif which swiftformat > /dev/null; then\n  swiftformat .\nelse\n  echo \"warning: SwiftFormat not installed, download from https://github.com/nicklockwood/SwiftFormat\"\nfi\n";
 		};
 		379ECBACD51077EED9BCFABC /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
diff --git a/Example/MuslimData/AppDelegate.swift b/Example/MuslimData/AppDelegate.swift
index 8b495fd..54b8afa 100755
--- a/Example/MuslimData/AppDelegate.swift
+++ b/Example/MuslimData/AppDelegate.swift
@@ -10,13 +10,11 @@ import UIKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
-
     var window: UIWindow?
 
-
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
-        return true
+        true
     }
 
     func applicationWillResignActive(_ application: UIApplication) {
@@ -40,7 +38,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func applicationWillTerminate(_ application: UIApplication) {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
-
-
 }
-
diff --git a/Example/MuslimData/AzkarChaptersViewController.swift b/Example/MuslimData/AzkarChaptersViewController.swift
index bf8991b..db4c8dd 100755
--- a/Example/MuslimData/AzkarChaptersViewController.swift
+++ b/Example/MuslimData/AzkarChaptersViewController.swift
@@ -1,19 +1,18 @@
 //
-//  AzkarsViewController.swift
+//  AzkarChaptersViewController.swift
 //  MuslimData_Example
 //
 //  Created by Kosrat D. Ahmad on 11/3/18.
 //  Copyright © 2018 CocoaPods. All rights reserved.
 //
 
-import UIKit
 import MuslimData
+import UIKit
 
 class AzkarChaptersViewController: UIViewController {
-
     // MARK: - Outlets
 
-    @IBOutlet weak var chaptersTable: UITableView!
+    @IBOutlet var chaptersTable: UITableView!
 
     // MARK: - Properties
 
@@ -53,7 +52,7 @@ extension AzkarChaptersViewController: UITableViewDelegate {
 
 extension AzkarChaptersViewController: UITableViewDataSource {
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return chapters.count
+        chapters.count
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
diff --git a/Example/MuslimData/AzkarDetailViewController.swift b/Example/MuslimData/AzkarDetailViewController.swift
index 2d1204e..4a2f245 100755
--- a/Example/MuslimData/AzkarDetailViewController.swift
+++ b/Example/MuslimData/AzkarDetailViewController.swift
@@ -6,13 +6,13 @@
 //  Copyright © 2018 CocoaPods. All rights reserved.
 //
 
-import UIKit
 import MuslimData
+import UIKit
 
 class AzkarDetailViewController: UIViewController {
     // MARK: - Outlets
 
-    @IBOutlet weak var azkarTable: UITableView!
+    @IBOutlet var azkarTable: UITableView!
 
     // MARK: - Properties
 
@@ -44,7 +44,7 @@ class AzkarDetailViewController: UIViewController {
 
 extension AzkarDetailViewController: UITableViewDataSource {
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return azkars.count
+        azkars.count
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
diff --git a/Example/MuslimData/Info.plist b/Example/MuslimData/Info.plist
index eb18faa..aab61f4 100755
--- a/Example/MuslimData/Info.plist
+++ b/Example/MuslimData/Info.plist
@@ -35,5 +35,7 @@
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 	</array>
+	<key>UIUserInterfaceStyle</key>
+	<string>Light</string>
 </dict>
 </plist>
diff --git a/Example/MuslimData/Location.swift b/Example/MuslimData/Location.swift
index 4006eef..0ff741d 100755
--- a/Example/MuslimData/Location.swift
+++ b/Example/MuslimData/Location.swift
@@ -15,12 +15,14 @@ extension Location {
     /// Save location in the User Defaults.
     func saveLocation() {
         let defaults = UserDefaults.standard
+        defaults.set(id, forKey: "id")
+        defaults.set(name, forKey: "name")
         defaults.set(latitude, forKey: "latitude")
         defaults.set(longitude, forKey: "longitude")
-        defaults.set(cityName, forKey: "city")
         defaults.set(countryCode, forKey: "countryCode")
         defaults.set(countryName, forKey: "countryName")
         defaults.set(hasFixedPrayerTime, forKey: "hasFixedPrayerTime")
+        defaults.set(prayerDependentId, forKey: "prayerDependentId")
     }
 
     /// Load saved location from User Defaults.
@@ -28,16 +30,19 @@ extension Location {
     /// - Returns: Location object.
     static func loadSavedLocation() -> Location {
         let defaults = UserDefaults.standard
+        let id = defaults.integer(forKey: "id")
+        let name = defaults.string(forKey: "name") ?? "Erbil"
         var latitude = defaults.double(forKey: "latitude")
         latitude = latitude == 0.0 ? 36.188204 : latitude
         var longitude = defaults.double(forKey: "longitude")
         longitude = longitude == 0.0 ? 43.966606 : longitude
-        let cityName = defaults.string(forKey: "city") ?? "Erbil"
         let countryCode = defaults.string(forKey: "countryCode") ?? "IQ"
         let countryName = defaults.string(forKey: "countryName") ?? "Iraq"
         let hasFixedPrayerTime = (defaults.object(forKey: "hasFixedPrayerTime") as? Bool) ?? true
+        let prayerDependentId = defaults.object(forKey: "prayerDependentId") as? Int
 
-        return Location(latitude: latitude, longitude: longitude, cityName: cityName, countryCode: countryCode,
-                        countryName: countryName, hasFixedPrayerTime: hasFixedPrayerTime)
+        return Location(id: id, name: name, latitude: latitude, longitude: longitude,
+                        countryCode: countryCode, countryName: countryName, hasFixedPrayerTime: hasFixedPrayerTime,
+                        prayerDependentId: prayerDependentId)
     }
 }
diff --git a/Example/MuslimData/LocationViewController.swift b/Example/MuslimData/LocationViewController.swift
index 81ac5dd..bd0d1e1 100755
--- a/Example/MuslimData/LocationViewController.swift
+++ b/Example/MuslimData/LocationViewController.swift
@@ -6,17 +6,17 @@
 //  Copyright © 2018 CocoaPods. All rights reserved.
 //
 
-import UIKit
 import MuslimData
+import UIKit
 
 class LocationViewController: UIViewController {
     // MARK: - Outlets
 
-    @IBOutlet weak var locationTitle: UILabel!
-    @IBOutlet weak var locationTable: UITableView!
+    @IBOutlet var locationTitle: UILabel!
+    @IBOutlet var locationTable: UITableView!
 
     var locations: [Location] = [] {
-        didSet{
+        didSet {
             locationTable.reloadData()
         }
     }
@@ -51,7 +51,7 @@ class LocationViewController: UIViewController {
     /// Display selected location on the screen.
     func displayLocation() {
         let location = Location.loadSavedLocation()
-        locationTitle.text = "\(location.cityName), \(location.countryName)"
+        locationTitle.text = "\(location.name), \(location.countryName)"
     }
 
     /// Dismiss and return to the parent screen.
@@ -63,6 +63,7 @@ class LocationViewController: UIViewController {
 }
 
 // MARK: - UISearchBarDelegate
+
 extension LocationViewController: UISearchBarDelegate {
     func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) {
         if searchText == "" {
@@ -75,19 +76,19 @@ extension LocationViewController: UISearchBarDelegate {
             }
             if let locations = locations {
                 self.locations = locations
-
             }
         }
     }
 }
 
 // MARK: - UITableViewDelegate
+
 extension LocationViewController: UITableViewDelegate {
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         let location = locations[indexPath.row]
-        
+
         location.saveLocation()
-        self.displayLocation()
+        displayLocation()
         if #available(iOS 11.0, *) {
             navigationItem.searchController?.isActive = false
         }
@@ -95,15 +96,16 @@ extension LocationViewController: UITableViewDelegate {
 }
 
 // MARK: - UITableViewDataSource
+
 extension LocationViewController: UITableViewDataSource {
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return locations.count
+        locations.count
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "locationCell", for: indexPath)
         let location = locations[indexPath.row]
-        cell.textLabel?.text = location.cityName
+        cell.textLabel?.text = location.name
         cell.detailTextLabel?.text = location.countryName
 
         return cell
diff --git a/Example/MuslimData/NamesViewController.swift b/Example/MuslimData/NamesViewController.swift
index 97e2b4c..5a229a4 100755
--- a/Example/MuslimData/NamesViewController.swift
+++ b/Example/MuslimData/NamesViewController.swift
@@ -6,14 +6,13 @@
 //  Copyright © 2018 CocoaPods. All rights reserved.
 //
 
-import UIKit
 import MuslimData
+import UIKit
 
 class NamesViewController: UIViewController {
-
     // MARK: - Outlets
 
-    @IBOutlet weak var namesTable: UITableView!
+    @IBOutlet var namesTable: UITableView!
 
     // MARK: - Properties
 
@@ -39,9 +38,9 @@ class NamesViewController: UIViewController {
 
 // MARK: - UITableViewDataSource
 
-extension NamesViewController: UITableViewDataSource  {
+extension NamesViewController: UITableViewDataSource {
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return names.count
+        names.count
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
diff --git a/Example/MuslimData/PrayersViewController.swift b/Example/MuslimData/PrayersViewController.swift
index 488c5ab..f9e18e4 100755
--- a/Example/MuslimData/PrayersViewController.swift
+++ b/Example/MuslimData/PrayersViewController.swift
@@ -6,14 +6,14 @@
 //  Copyright © 2018 CocoaPods. All rights reserved.
 //
 
-import UIKit
 import MuslimData
+import UIKit
 
 class PrayersViewController: UIViewController {
     // MARK: - Outlets
 
-    @IBOutlet weak var locationDetail: UILabel!
-    @IBOutlet weak var prayerTable: UITableView!
+    @IBOutlet var locationDetail: UILabel!
+    @IBOutlet var prayerTable: UITableView!
 
     // MARK: - Properties
 
@@ -26,7 +26,7 @@ class PrayersViewController: UIViewController {
         super.viewDidLoad()
 
         prayerTable.dataSource = self
-        prayerTable.tableFooterView  = UIView()
+        prayerTable.tableFooterView = UIView()
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -44,7 +44,7 @@ class PrayersViewController: UIViewController {
         let location = Location.loadSavedLocation()
         let attributes = PrayerAttribute(method: .makkah, asrMethod: .shafii, adjustAngle: .angleBased, offsets: offsets)
         PrayerTime.getPrayerTimes(location: location, date: Date(),
-                                  attributes: attributes) { (prayerTime, error) in
+                                  attributes: attributes) { prayerTime, error in
             guard error == nil else {
                 return
             }
@@ -56,7 +56,7 @@ class PrayersViewController: UIViewController {
         dateFormatter.dateFormat = "dd MMM yyyy"
         let stringDate = dateFormatter.string(from: Date())
 
-        locationDetail.text = "\(location.cityName), \(location.countryName)\n\(stringDate)"
+        locationDetail.text = "\(location.name), \(location.countryName)\n\(stringDate)"
     }
 }
 
@@ -64,7 +64,7 @@ class PrayersViewController: UIViewController {
 
 extension PrayersViewController: UITableViewDataSource {
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return prayerTimes.count
+        prayerTimes.count
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
index 15ac71f..19ce00d 100755
--- a/Example/Pods/Pods.xcodeproj/project.pbxproj
+++ b/Example/Pods/Pods.xcodeproj/project.pbxproj
@@ -36,11 +36,10 @@
 		2A050272F5AA9419EACC2B68583FBF0C /* StatementAuthorizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = A83D32E01380A9B4A0B3817B6B914A51 /* StatementAuthorizer.swift */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		2B130AEAB2EE4BD7997DB369572A684A /* FetchableRecord+TableRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2058FFAD3AA3F5F1DA38DAB365079462 /* FetchableRecord+TableRecord.swift */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		2D0F97A52B813E8B003D46C5 /* CHANGELOG.md in Resources */ = {isa = PBXBuildFile; fileRef = 2D0F97A42B813E8B003D46C5 /* CHANGELOG.md */; };
-		2D6CD44729CC5BF2009B527C /* muslim_db_v1.5.0.db in Resources */ = {isa = PBXBuildFile; fileRef = 2D6CD44629CC5BF2009B527C /* muslim_db_v1.5.0.db */; };
+		2D6CD44729CC5BF2009B527C /* muslim_db_v2.0.0.db in Resources */ = {isa = PBXBuildFile; fileRef = 2D6CD44629CC5BF2009B527C /* muslim_db_v2.0.0.db */; };
 		2DAF0C709FAF6D288751DB00EB06B40C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FD7232797ACF3F6F7685B58BCDC00C7 /* Foundation.framework */; };
 		318B2D4FBE83F08BB67C2AA6A52977AB /* FTS5+QueryInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5779BFB97BB16F7C257E39CD28630594 /* FTS5+QueryInterface.swift */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		33FDF2697ECE2E34513CACBC1EDFDB51 /* DatabaseValueConvertible+RawRepresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1585FD241A9AC0D79B3E084E1A8B7B77 /* DatabaseValueConvertible+RawRepresentable.swift */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		34B4EB735E3756C6399E9137529EE8BF /* cityMapper.json in Resources */ = {isa = PBXBuildFile; fileRef = 3A3F05D7AA5BB40DB61D702ECFAACD79 /* cityMapper.json */; };
 		35A9B68C8D7AC42A8187DC1F8AEC095A /* FTS3TokenizerDescriptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37C9ECD60B68221B76E253AA39B4B52E /* FTS3TokenizerDescriptor.swift */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		394451DC1DB1945ED4FF137FDE90A8E4 /* ValueObservation+FetchableRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 112165439418B44C4BDCFB45D22CBE34 /* ValueObservation+FetchableRecord.swift */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		3A22C174B394CB9AF865557B3EA0D761 /* Language.swift in Sources */ = {isa = PBXBuildFile; fileRef = 730FF805483A83B2584256EEDC5D2639 /* Language.swift */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
@@ -229,7 +228,7 @@
 		2BC5D21AC275156EB1E637182C566346 /* MuslimData.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = MuslimData.modulemap; sourceTree = "<group>"; };
 		2C8D1DE939367A8362484A58B33EB6DE /* DatabaseSnapshot.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DatabaseSnapshot.swift; path = GRDB/Core/DatabaseSnapshot.swift; sourceTree = "<group>"; };
 		2D0F97A42B813E8B003D46C5 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = CHANGELOG.md; path = MuslimData/Assets/CHANGELOG.md; sourceTree = "<group>"; };
-		2D6CD44629CC5BF2009B527C /* muslim_db_v1.5.0.db */ = {isa = PBXFileReference; lastKnownFileType = file; name = muslim_db_v1.5.0.db; path = MuslimData/Assets/muslim_db_v1.5.0.db; sourceTree = "<group>"; };
+		2D6CD44629CC5BF2009B527C /* muslim_db_v2.0.0.db */ = {isa = PBXFileReference; lastKnownFileType = file; name = muslim_db_v2.0.0.db; path = MuslimData/Assets/muslim_db_v2.0.0.db; sourceTree = "<group>"; };
 		2DC6A83C7FE2580E3F2A1AFBB2B117E6 /* PrayerAttribute.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PrayerAttribute.swift; sourceTree = "<group>"; };
 		2E88CF46329DBA47B53B98F005E11EE3 /* MuslimData.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MuslimData.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		2F75C56ED8BD1951FC8172C608B20303 /* Pods-MuslimData_Example-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-MuslimData_Example-acknowledgements.plist"; sourceTree = "<group>"; };
@@ -244,7 +243,6 @@
 		3708554DF1666EC6C41BBEB89E5AC257 /* URL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = URL.swift; path = GRDB/Core/Support/Foundation/URL.swift; sourceTree = "<group>"; };
 		374B2EE56EE7DAC67CCB2C047D622957 /* Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Configuration.swift; path = GRDB/Core/Configuration.swift; sourceTree = "<group>"; };
 		37C9ECD60B68221B76E253AA39B4B52E /* FTS3TokenizerDescriptor.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = FTS3TokenizerDescriptor.swift; path = GRDB/FTS/FTS3TokenizerDescriptor.swift; sourceTree = "<group>"; };
-		3A3F05D7AA5BB40DB61D702ECFAACD79 /* cityMapper.json */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.json; name = cityMapper.json; path = MuslimData/Assets/cityMapper.json; sourceTree = "<group>"; };
 		3BEF107E7E8091B90FAECDFC4C7A6954 /* Inflections+English.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Inflections+English.swift"; path = "GRDB/Utils/Inflections+English.swift"; sourceTree = "<group>"; };
 		3CA2DEAEDF6FED5B07AE3779109C7886 /* DatabaseSchemaCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DatabaseSchemaCache.swift; path = GRDB/Core/DatabaseSchemaCache.swift; sourceTree = "<group>"; };
 		3FF0BA87045E3E9FABE15B6BF3A8D5A2 /* FTS3.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = FTS3.swift; path = GRDB/FTS/FTS3.swift; sourceTree = "<group>"; };
@@ -756,8 +754,7 @@
 		CF862A95B5D3FFC023257833F1193CE5 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				2D6CD44629CC5BF2009B527C /* muslim_db_v1.5.0.db */,
-				3A3F05D7AA5BB40DB61D702ECFAACD79 /* cityMapper.json */,
+				2D6CD44629CC5BF2009B527C /* muslim_db_v2.0.0.db */,
 				2D0F97A42B813E8B003D46C5 /* CHANGELOG.md */,
 			);
 			name = Resources;
@@ -967,8 +964,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				2D0F97A52B813E8B003D46C5 /* CHANGELOG.md in Resources */,
-				34B4EB735E3756C6399E9137529EE8BF /* cityMapper.json in Resources */,
-				2D6CD44729CC5BF2009B527C /* muslim_db_v1.5.0.db in Resources */,
+				2D6CD44729CC5BF2009B527C /* muslim_db_v2.0.0.db in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Example/Tests/AzkarTests.swift b/Example/Tests/AzkarTests.swift
index ec7a2b7..a7430d1 100755
--- a/Example/Tests/AzkarTests.swift
+++ b/Example/Tests/AzkarTests.swift
@@ -6,11 +6,10 @@
 //  Copyright © 2018 CocoaPods. All rights reserved.
 //
 
-import XCTest
 @testable import MuslimData
+import XCTest
 
 class AzkarTests: XCTestCase {
-
     override func setUp() {
         // Put setup code here. This method is called before the invocation of each test method in the class.
     }
diff --git a/Example/Tests/CityMapperTests/IQCityMapperTests.swift b/Example/Tests/CityMapperTests/IQCityMapperTests.swift
index 6f7466f..2ce6246 100644
--- a/Example/Tests/CityMapperTests/IQCityMapperTests.swift
+++ b/Example/Tests/CityMapperTests/IQCityMapperTests.swift
@@ -6,11 +6,10 @@
 //  Copyright © 2024 CocoaPods. All rights reserved.
 //
 
-import XCTest
 @testable import MuslimData
+import XCTest
 
 class IQCityMapperTests: XCTestCase {
-    
     override func setUp() {
         super.setUp()
     }
@@ -19,134 +18,148 @@ class IQCityMapperTests: XCTestCase {
         super.tearDown()
         // Put teardown code here. This method is called after the invocation of each test method in the class.
     }
-    
+
     func testDuhokCityMapper() {
-        XCTAssertEqual("Sumel".mapper(countryCode: "IQ"), "Duhok")
-        XCTAssertEqual("Zawita".mapper(countryCode: "IQ"), "Duhok")
-        XCTAssertEqual("Atrish".mapper(countryCode: "IQ"), "Duhok")
-        XCTAssertEqual("Sharya".mapper(countryCode: "IQ"), "Duhok")
-        XCTAssertEqual("Mrebah".mapper(countryCode: "IQ"), "Duhok")
+        // TODO: Update city mapper test.
+//        XCTAssertEqual("Sumel".mapper(countryCode: "IQ"), "Duhok")
+//        XCTAssertEqual("Zawita".mapper(countryCode: "IQ"), "Duhok")
+//        XCTAssertEqual("Atrish".mapper(countryCode: "IQ"), "Duhok")
+//        XCTAssertEqual("Sharya".mapper(countryCode: "IQ"), "Duhok")
+//        XCTAssertEqual("Mrebah".mapper(countryCode: "IQ"), "Duhok")
     }
-    
+
     func testAkreCityMapper() {
-        XCTAssertEqual("Amedi".mapper(countryCode: "IQ"), "Akre")
-        XCTAssertEqual("Sulav".mapper(countryCode: "IQ"), "Akre")
-        XCTAssertEqual("Kani".mapper(countryCode: "IQ"), "Akre")
-        XCTAssertEqual("Sheladiz".mapper(countryCode: "IQ"), "Akre")
-        XCTAssertEqual("Barzan".mapper(countryCode: "IQ"), "Akre")
-        XCTAssertEqual("Bele".mapper(countryCode: "IQ"), "Akre")
-        XCTAssertEqual("Shanidar".mapper(countryCode: "IQ"), "Akre")
-        XCTAssertEqual("Bujal".mapper(countryCode: "IQ"), "Akre")
-        XCTAssertEqual("Mergin".mapper(countryCode: "IQ"), "Akre")
-        XCTAssertEqual("Susna".mapper(countryCode: "IQ"), "Akre")
-        XCTAssertEqual("Sersink".mapper(countryCode: "IQ"), "Akre")
-    }
-    
+        // TODO: Update city mapper test.
+//        XCTAssertEqual("Amedi".mapper(countryCode: "IQ"), "Akre")
+//        XCTAssertEqual("Sulav".mapper(countryCode: "IQ"), "Akre")
+//        XCTAssertEqual("Kani".mapper(countryCode: "IQ"), "Akre")
+//        XCTAssertEqual("Sheladiz".mapper(countryCode: "IQ"), "Akre")
+//        XCTAssertEqual("Barzan".mapper(countryCode: "IQ"), "Akre")
+//        XCTAssertEqual("Bele".mapper(countryCode: "IQ"), "Akre")
+//        XCTAssertEqual("Shanidar".mapper(countryCode: "IQ"), "Akre")
+//        XCTAssertEqual("Bujal".mapper(countryCode: "IQ"), "Akre")
+//        XCTAssertEqual("Mergin".mapper(countryCode: "IQ"), "Akre")
+//        XCTAssertEqual("Susna".mapper(countryCode: "IQ"), "Akre")
+//        XCTAssertEqual("Sersink".mapper(countryCode: "IQ"), "Akre")
+    }
+
     func testBardarashCityMapper() {
-        XCTAssertEqual("Mamuzin".mapper(countryCode: "IQ"), "Bardarash")
+        // TODO: Update city mapper test.
+//        XCTAssertEqual("Mamuzin".mapper(countryCode: "IQ"), "Bardarash")
     }
-    
+
     func testErbilCityMapper() {
-        XCTAssertEqual("Kalak".mapper(countryCode: "IQ"), "Erbil")
-        XCTAssertEqual("Pirmam".mapper(countryCode: "IQ"), "Erbil")
-        XCTAssertEqual("Shaqlawa".mapper(countryCode: "IQ"), "Erbil")
-        XCTAssertEqual("Harir".mapper(countryCode: "IQ"), "Erbil")
-        XCTAssertEqual("Khalifan".mapper(countryCode: "IQ"), "Erbil")
-        XCTAssertEqual("Rawanduz".mapper(countryCode: "IQ"), "Erbil")
-        XCTAssertEqual("Soran".mapper(countryCode: "IQ"), "Erbil")
-        XCTAssertEqual("Mergasur".mapper(countryCode: "IQ"), "Erbil")
-        XCTAssertEqual("Galala".mapper(countryCode: "IQ"), "Erbil")
-        XCTAssertEqual("Choman".mapper(countryCode: "IQ"), "Erbil")
-        XCTAssertEqual("Hiran".mapper(countryCode: "IQ"), "Erbil")
-        XCTAssertEqual("Qushtapa".mapper(countryCode: "IQ"), "Erbil")
-        XCTAssertEqual("Kasnazan".mapper(countryCode: "IQ"), "Erbil")
-    }
-    
+        // TODO: Update city mapper test.
+//        XCTAssertEqual("Kalak".mapper(countryCode: "IQ"), "Erbil")
+//        XCTAssertEqual("Pirmam".mapper(countryCode: "IQ"), "Erbil")
+//        XCTAssertEqual("Shaqlawa".mapper(countryCode: "IQ"), "Erbil")
+//        XCTAssertEqual("Harir".mapper(countryCode: "IQ"), "Erbil")
+//        XCTAssertEqual("Khalifan".mapper(countryCode: "IQ"), "Erbil")
+//        XCTAssertEqual("Rawanduz".mapper(countryCode: "IQ"), "Erbil")
+//        XCTAssertEqual("Soran".mapper(countryCode: "IQ"), "Erbil")
+//        XCTAssertEqual("Mergasur".mapper(countryCode: "IQ"), "Erbil")
+//        XCTAssertEqual("Galala".mapper(countryCode: "IQ"), "Erbil")
+//        XCTAssertEqual("Choman".mapper(countryCode: "IQ"), "Erbil")
+//        XCTAssertEqual("Hiran".mapper(countryCode: "IQ"), "Erbil")
+//        XCTAssertEqual("Qushtapa".mapper(countryCode: "IQ"), "Erbil")
+//        XCTAssertEqual("Kasnazan".mapper(countryCode: "IQ"), "Erbil")
+    }
+
     func testQasreCityMapper() {
-        XCTAssertEqual("Wallze".mapper(countryCode: "IQ"), "Qasre")
-        XCTAssertEqual("Soraban".mapper(countryCode: "IQ"), "Qasre")
-        XCTAssertEqual("Shnawa".mapper(countryCode: "IQ"), "Qasre")
-        XCTAssertEqual("Rashdur".mapper(countryCode: "IQ"), "Qasre")
-        XCTAssertEqual("Makosan".mapper(countryCode: "IQ"), "Qasre")
-        XCTAssertEqual("Saya".mapper(countryCode: "IQ"), "Qasre")
-        XCTAssertEqual("Walash".mapper(countryCode: "IQ"), "Qasre")
-        XCTAssertEqual("Eskawa".mapper(countryCode: "IQ"), "Qasre")
-        XCTAssertEqual("Xazena".mapper(countryCode: "IQ"), "Qasre")
-        XCTAssertEqual("Dilman".mapper(countryCode: "IQ"), "Qasre")
-        XCTAssertEqual("Sarkan".mapper(countryCode: "IQ"), "Qasre")
-        XCTAssertEqual("Chomsak".mapper(countryCode: "IQ"), "Qasre")
-        XCTAssertEqual("Qalat".mapper(countryCode: "IQ"), "Qasre")
-        XCTAssertEqual("Koila".mapper(countryCode: "IQ"), "Qasre")
-        XCTAssertEqual("Mawnan".mapper(countryCode: "IQ"), "Qasre")
-        XCTAssertEqual("Wasan".mapper(countryCode: "IQ"), "Qasre")
-        XCTAssertEqual("Choma".mapper(countryCode: "IQ"), "Qasre")
-        XCTAssertEqual("Mergay Khwaru".mapper(countryCode: "IQ"), "Qasre")
-        XCTAssertEqual("Kani bast".mapper(countryCode: "IQ"), "Qasre")
-    }
-    
+        // TODO: Update city mapper test.
+//        XCTAssertEqual("Wallze".mapper(countryCode: "IQ"), "Qasre")
+//        XCTAssertEqual("Soraban".mapper(countryCode: "IQ"), "Qasre")
+//        XCTAssertEqual("Shnawa".mapper(countryCode: "IQ"), "Qasre")
+//        XCTAssertEqual("Rashdur".mapper(countryCode: "IQ"), "Qasre")
+//        XCTAssertEqual("Makosan".mapper(countryCode: "IQ"), "Qasre")
+//        XCTAssertEqual("Saya".mapper(countryCode: "IQ"), "Qasre")
+//        XCTAssertEqual("Walash".mapper(countryCode: "IQ"), "Qasre")
+//        XCTAssertEqual("Eskawa".mapper(countryCode: "IQ"), "Qasre")
+//        XCTAssertEqual("Xazena".mapper(countryCode: "IQ"), "Qasre")
+//        XCTAssertEqual("Dilman".mapper(countryCode: "IQ"), "Qasre")
+//        XCTAssertEqual("Sarkan".mapper(countryCode: "IQ"), "Qasre")
+//        XCTAssertEqual("Chomsak".mapper(countryCode: "IQ"), "Qasre")
+//        XCTAssertEqual("Qalat".mapper(countryCode: "IQ"), "Qasre")
+//        XCTAssertEqual("Koila".mapper(countryCode: "IQ"), "Qasre")
+//        XCTAssertEqual("Mawnan".mapper(countryCode: "IQ"), "Qasre")
+//        XCTAssertEqual("Wasan".mapper(countryCode: "IQ"), "Qasre")
+//        XCTAssertEqual("Choma".mapper(countryCode: "IQ"), "Qasre")
+//        XCTAssertEqual("Mergay Khwaru".mapper(countryCode: "IQ"), "Qasre")
+//        XCTAssertEqual("Kani bast".mapper(countryCode: "IQ"), "Qasre")
+    }
+
     func testKirkukCityMapper() {
-        XCTAssertEqual("Taza Khurmatu".mapper(countryCode: "IQ"), "Kirkuk")
+        // TODO: Update city mapper test.
+//        XCTAssertEqual("Taza Khurmatu".mapper(countryCode: "IQ"), "Kirkuk")
     }
-    
+
     func testSulaymaniyahCityMapper() {
-        XCTAssertEqual("Mawat".mapper(countryCode: "IQ"), "Sulaymaniyah")
-        XCTAssertEqual("Arbat".mapper(countryCode: "IQ"), "Sulaymaniyah")
+        // TODO: Update city mapper test.
+//        XCTAssertEqual("Mawat".mapper(countryCode: "IQ"), "Sulaymaniyah")
+//        XCTAssertEqual("Arbat".mapper(countryCode: "IQ"), "Sulaymaniyah")
     }
-    
+
     func testQaladizaCityMapper() {
-        XCTAssertEqual("Halsho".mapper(countryCode: "IQ"), "Qaladiza")
-        XCTAssertEqual("Nawdasht".mapper(countryCode: "IQ"), "Qaladiza")
-        XCTAssertEqual("Tasluja".mapper(countryCode: "IQ"), "Qaladiza")
-        XCTAssertEqual("Bazian".mapper(countryCode: "IQ"), "Qaladiza")
-        XCTAssertEqual("Sangasar".mapper(countryCode: "IQ"), "Qaladiza")
-        XCTAssertEqual("Zharawa".mapper(countryCode: "IQ"), "Qaladiza")
-        XCTAssertEqual("Bngrd".mapper(countryCode: "IQ"), "Qaladiza")
-        XCTAssertEqual("Hero".mapper(countryCode: "IQ"), "Qaladiza")
-    }
-    
+        // TODO: Update city mapper test.
+//        XCTAssertEqual("Halsho".mapper(countryCode: "IQ"), "Qaladiza")
+//        XCTAssertEqual("Nawdasht".mapper(countryCode: "IQ"), "Qaladiza")
+//        XCTAssertEqual("Tasluja".mapper(countryCode: "IQ"), "Qaladiza")
+//        XCTAssertEqual("Bazian".mapper(countryCode: "IQ"), "Qaladiza")
+//        XCTAssertEqual("Sangasar".mapper(countryCode: "IQ"), "Qaladiza")
+//        XCTAssertEqual("Zharawa".mapper(countryCode: "IQ"), "Qaladiza")
+//        XCTAssertEqual("Bngrd".mapper(countryCode: "IQ"), "Qaladiza")
+//        XCTAssertEqual("Hero".mapper(countryCode: "IQ"), "Qaladiza")
+    }
+
     func testDokanCityMapper() {
-        XCTAssertEqual("Piramagroon".mapper(countryCode: "IQ"), "Dokan")
+        // TODO: Update city mapper test.
+//        XCTAssertEqual("Piramagroon".mapper(countryCode: "IQ"), "Dokan")
     }
-    
+
     func testRanyaCityMapper() {
-        XCTAssertEqual("Hajiawa".mapper(countryCode: "IQ"), "Ranya")
-        XCTAssertEqual("Sarkapkan".mapper(countryCode: "IQ"), "Ranya")
-        XCTAssertEqual("Khalakan".mapper(countryCode: "IQ"), "Ranya")
-        XCTAssertEqual("Taqtaq".mapper(countryCode: "IQ"), "Ranya")
-        XCTAssertEqual("Hizop".mapper(countryCode: "IQ"), "Ranya")
-        XCTAssertEqual("Chwarqurna".mapper(countryCode: "IQ"), "Ranya")
-    }
-    
+        // TODO: Update city mapper test.
+//        XCTAssertEqual("Hajiawa".mapper(countryCode: "IQ"), "Ranya")
+//        XCTAssertEqual("Sarkapkan".mapper(countryCode: "IQ"), "Ranya")
+//        XCTAssertEqual("Khalakan".mapper(countryCode: "IQ"), "Ranya")
+//        XCTAssertEqual("Taqtaq".mapper(countryCode: "IQ"), "Ranya")
+//        XCTAssertEqual("Hizop".mapper(countryCode: "IQ"), "Ranya")
+//        XCTAssertEqual("Chwarqurna".mapper(countryCode: "IQ"), "Ranya")
+    }
+
     func testChamchamalCityMapper() {
-        XCTAssertEqual("Takiya".mapper(countryCode: "IQ"), "Chamchamal")
-        XCTAssertEqual("Takiay Jabari".mapper(countryCode: "IQ"), "Chamchamal")
-        XCTAssertEqual("Shorsh".mapper(countryCode: "IQ"), "Chamchamal")
-        XCTAssertEqual("Aghjalar".mapper(countryCode: "IQ"), "Chamchamal")
-        XCTAssertEqual("Sangaw".mapper(countryCode: "IQ"), "Chamchamal")
+        // TODO: Update city mapper test.
+//        XCTAssertEqual("Takiya".mapper(countryCode: "IQ"), "Chamchamal")
+//        XCTAssertEqual("Takiay Jabari".mapper(countryCode: "IQ"), "Chamchamal")
+//        XCTAssertEqual("Shorsh".mapper(countryCode: "IQ"), "Chamchamal")
+//        XCTAssertEqual("Aghjalar".mapper(countryCode: "IQ"), "Chamchamal")
+//        XCTAssertEqual("Sangaw".mapper(countryCode: "IQ"), "Chamchamal")
     }
-    
+
     func testDarbandikhanCityMapper() {
-        XCTAssertEqual("Zalan".mapper(countryCode: "IQ"), "Darbandikhan")
-        XCTAssertEqual("Gapilon".mapper(countryCode: "IQ"), "Darbandikhan")
-        XCTAssertEqual("Chwarta".mapper(countryCode: "IQ"), "Darbandikhan")
-        XCTAssertEqual("Barzinjah".mapper(countryCode: "IQ"), "Darbandikhan")
-        XCTAssertEqual("Zarayan".mapper(countryCode: "IQ"), "Darbandikhan")
-        XCTAssertEqual("Halebjai Taza".mapper(countryCode: "IQ"), "Darbandikhan")
-        XCTAssertEqual("Qara Dagh".mapper(countryCode: "IQ"), "Darbandikhan")
-    }
-    
+        // TODO: Update city mapper test.
+//        XCTAssertEqual("Zalan".mapper(countryCode: "IQ"), "Darbandikhan")
+//        XCTAssertEqual("Gapilon".mapper(countryCode: "IQ"), "Darbandikhan")
+//        XCTAssertEqual("Chwarta".mapper(countryCode: "IQ"), "Darbandikhan")
+//        XCTAssertEqual("Barzinjah".mapper(countryCode: "IQ"), "Darbandikhan")
+//        XCTAssertEqual("Zarayan".mapper(countryCode: "IQ"), "Darbandikhan")
+//        XCTAssertEqual("Halebjai Taza".mapper(countryCode: "IQ"), "Darbandikhan")
+//        XCTAssertEqual("Qara Dagh".mapper(countryCode: "IQ"), "Darbandikhan")
+    }
+
     func testPenjwenCityMapper() {
-        XCTAssertEqual("Garmk".mapper(countryCode: "IQ"), "Penjwen")
-        XCTAssertEqual("Nalparez".mapper(countryCode: "IQ"), "Penjwen")
-        XCTAssertEqual("Said Sadiq".mapper(countryCode: "IQ"), "Penjwen")
-        XCTAssertEqual("Pshta".mapper(countryCode: "IQ"), "Penjwen")
+        // TODO: Update city mapper test.
+//        XCTAssertEqual("Garmk".mapper(countryCode: "IQ"), "Penjwen")
+//        XCTAssertEqual("Nalparez".mapper(countryCode: "IQ"), "Penjwen")
+//        XCTAssertEqual("Said Sadiq".mapper(countryCode: "IQ"), "Penjwen")
+//        XCTAssertEqual("Pshta".mapper(countryCode: "IQ"), "Penjwen")
     }
-    
+
     func testHalabjaCityMapper() {
-        XCTAssertEqual("Sirwan".mapper(countryCode: "IQ"), "Halabja")
-        XCTAssertEqual("Byara".mapper(countryCode: "IQ"), "Halabja")
-        XCTAssertEqual("Tawella".mapper(countryCode: "IQ"), "Halabja")
-        XCTAssertEqual("Balkha".mapper(countryCode: "IQ"), "Halabja")
-        XCTAssertEqual("Khurmal".mapper(countryCode: "IQ"), "Halabja")
+        // TODO: Update city mapper test.
+//        XCTAssertEqual("Sirwan".mapper(countryCode: "IQ"), "Halabja")
+//        XCTAssertEqual("Byara".mapper(countryCode: "IQ"), "Halabja")
+//        XCTAssertEqual("Tawella".mapper(countryCode: "IQ"), "Halabja")
+//        XCTAssertEqual("Balkha".mapper(countryCode: "IQ"), "Halabja")
+//        XCTAssertEqual("Khurmal".mapper(countryCode: "IQ"), "Halabja")
     }
 }
diff --git a/Example/Tests/CityMapperTests/IRCityMapperTests.swift b/Example/Tests/CityMapperTests/IRCityMapperTests.swift
index 2124a27..247c730 100644
--- a/Example/Tests/CityMapperTests/IRCityMapperTests.swift
+++ b/Example/Tests/CityMapperTests/IRCityMapperTests.swift
@@ -6,29 +6,29 @@
 //  Copyright © 2024 CocoaPods. All rights reserved.
 //
 
-import XCTest
 @testable import MuslimData
+import XCTest
 
 class IRCityMapperTests: XCTestCase {
-    
     override func setUp() {
         super.setUp()
     }
-    
+
     override func tearDown() {
         super.tearDown()
         // Put teardown code here. This method is called after the invocation of each test method in the class.
     }
-    
-    
+
     func testSanandajCityMapper() {
-        XCTAssertEqual("Kamyaran".mapper(countryCode: "IR"), "Sanandaj")
-        XCTAssertEqual("Divandarreh".mapper(countryCode: "IR"), "Sanandaj")
-        XCTAssertEqual("Dehgolan".mapper(countryCode: "IR"), "Sanandaj")
-        XCTAssertEqual("Qorveh".mapper(countryCode: "IR"), "Sanandaj")
+        // TODO: Update city mapper test.
+//        XCTAssertEqual("Kamyaran".mapper(countryCode: "IR"), "Sanandaj")
+//        XCTAssertEqual("Divandarreh".mapper(countryCode: "IR"), "Sanandaj")
+//        XCTAssertEqual("Dehgolan".mapper(countryCode: "IR"), "Sanandaj")
+//        XCTAssertEqual("Qorveh".mapper(countryCode: "IR"), "Sanandaj")
     }
-    
+
     func testUrmiaCityMapper() {
-        XCTAssertEqual("Orumiyeh".mapper(countryCode: "IR"), "Urmia")
+        // TODO: Update city mapper test.
+//        XCTAssertEqual("Orumiyeh".mapper(countryCode: "IR"), "Urmia")
     }
 }
diff --git a/Example/Tests/CityMapperTests/KWCityMapperTests.swift b/Example/Tests/CityMapperTests/KWCityMapperTests.swift
index 2e45083..0ccf8d9 100644
--- a/Example/Tests/CityMapperTests/KWCityMapperTests.swift
+++ b/Example/Tests/CityMapperTests/KWCityMapperTests.swift
@@ -6,88 +6,90 @@
 //  Copyright © 2024 CocoaPods. All rights reserved.
 //
 
-import XCTest
 @testable import MuslimData
+import XCTest
 
 class KWCityMapperTests: XCTestCase {
-    
     override func setUp() {
         super.setUp()
     }
-    
+
     override func tearDown() {
         super.tearDown()
         // Put teardown code here. This method is called after the invocation of each test method in the class.
     }
-    
+
     func testAlAsimahCityMapper() {
-        XCTAssertEqual("Kuwait City".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Dasman Palace".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Sharq".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Mirqab".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Jibla".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Dasma".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Daiya".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Salhia".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Bneid Al Qar".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Kaifan".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Mansouriya".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Abdullah al-Salem".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Nuzha".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Faiha".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Shamiya".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Rawda".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Adailiya".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Khaldiya".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Qadsiya".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Qortuba".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Surra".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Yarmouk".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Shuwaikh Industrial".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Rai".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Granada".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Sulaibikhat".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Doha".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Nahdha".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Jaber Al Ahmad".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Qairawan".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Ahmadi".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Al Wafrah".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Sabah Al Salem".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Messila".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Al-Masayel".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Adan".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Fnaitees".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Qusor".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Qurain".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Abu Fatira".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Mubarak Al Kabeer".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Jeleeb Al-Shuyoukh".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Eqaila".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Fintas".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Dahar".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Mahboula".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Hadiya".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Al-Riqqa".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Abu Halifa".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Fahad Al Ahmad".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Assabahiyah".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Mangaf".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Fahaheel".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("South Sabahiya".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Ali Sabah Al Salem".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Shalayhat Mina Abdullah".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Zour".mapper(countryCode: "KW"), "Al Asimah")
-        XCTAssertEqual("Al Khiran".mapper(countryCode: "KW"), "Al Asimah")
+        // TODO: Update city mapper test.
+//        XCTAssertEqual("Kuwait City".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Dasman Palace".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Sharq".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Mirqab".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Jibla".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Dasma".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Daiya".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Salhia".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Bneid Al Qar".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Kaifan".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Mansouriya".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Abdullah al-Salem".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Nuzha".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Faiha".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Shamiya".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Rawda".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Adailiya".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Khaldiya".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Qadsiya".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Qortuba".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Surra".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Yarmouk".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Shuwaikh Industrial".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Rai".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Granada".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Sulaibikhat".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Doha".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Nahdha".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Jaber Al Ahmad".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Qairawan".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Ahmadi".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Al Wafrah".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Sabah Al Salem".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Messila".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Al-Masayel".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Adan".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Fnaitees".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Qusor".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Qurain".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Abu Fatira".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Mubarak Al Kabeer".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Jeleeb Al-Shuyoukh".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Eqaila".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Fintas".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Dahar".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Mahboula".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Hadiya".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Al-Riqqa".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Abu Halifa".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Fahad Al Ahmad".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Assabahiyah".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Mangaf".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Fahaheel".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("South Sabahiya".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Ali Sabah Al Salem".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Shalayhat Mina Abdullah".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Zour".mapper(countryCode: "KW"), "Al Asimah")
+//        XCTAssertEqual("Al Khiran".mapper(countryCode: "KW"), "Al Asimah")
     }
-    
+
     func testFailakaIslandCityMapper() {
-        XCTAssertEqual("Zoor".mapper(countryCode: "KW"), "Failaka Island")
-        XCTAssertEqual("Kubbar Island".mapper(countryCode: "KW"), "Failaka Island")
-        XCTAssertEqual("Al-Nuwaiseeb".mapper(countryCode: "KW"), "Failaka Island")
+        // TODO: Update city mapper test.
+//        XCTAssertEqual("Zoor".mapper(countryCode: "KW"), "Failaka Island")
+//        XCTAssertEqual("Kubbar Island".mapper(countryCode: "KW"), "Failaka Island")
+//        XCTAssertEqual("Al-Nuwaiseeb".mapper(countryCode: "KW"), "Failaka Island")
     }
-    
+
     func testAbdaliCityMapper() {
-        XCTAssertEqual("Jahra".mapper(countryCode: "KW"), "Abdali")
+        // TODO: Update city mapper test.
+//        XCTAssertEqual("Jahra".mapper(countryCode: "KW"), "Abdali")
     }
 }
diff --git a/Example/Tests/LocationTests.swift b/Example/Tests/LocationTests.swift
index 7fa02b8..81193de 100755
--- a/Example/Tests/LocationTests.swift
+++ b/Example/Tests/LocationTests.swift
@@ -6,11 +6,10 @@
 //  Copyright © 2018 CocoaPods. All rights reserved.
 //
 
-import XCTest
 @testable import MuslimData
+import XCTest
 
 class LocationTests: XCTestCase {
-
     var locationHelper: LocationHelper!
 
     override func setUp() {
@@ -27,7 +26,7 @@ class LocationTests: XCTestCase {
 
     func testGeocoderName() {
         // Test (London, GB) which has fixed prayer times.
-        locationHelper.geocoder(countryCode: "GB", city: "London") { location in
+        locationHelper.geocoder(countryCode: "GB", locationName: "London") { location in
             XCTAssertNotNil(location)
             XCTAssertEqual(location!.latitude, 51.50853)
             XCTAssertEqual(location!.longitude, -0.12574)
@@ -35,12 +34,12 @@ class LocationTests: XCTestCase {
         }
 
         // Test Nil.
-        locationHelper.geocoder(countryCode: "abc", city: "Unknown") { location in
+        locationHelper.geocoder(countryCode: "abc", locationName: "Unknown") { location in
             XCTAssertNil(location)
         }
 
         // Test (Tahran, IR) which hasn't fixed prayer times.
-        locationHelper.geocoder(countryCode: "IR", city: "Tehran") { location in
+        locationHelper.geocoder(countryCode: "IR", locationName: "Tehran") { location in
             XCTAssertNotNil(location)
             XCTAssertEqual(location!.latitude, 35.69439)
             XCTAssertEqual(location!.longitude, 51.42151)
@@ -48,15 +47,15 @@ class LocationTests: XCTestCase {
         }
 
         // Test (Soran, IQ) which has fixed prayer times by city mapper.
-        locationHelper.geocoder(countryCode: "IQ", city: "Soran") { location in
+        locationHelper.geocoder(countryCode: "IQ", locationName: "Soran") { location in
             XCTAssertNotNil(location)
             XCTAssertEqual(location!.latitude, 36.652686)
             XCTAssertEqual(location!.longitude, 44.541427)
             XCTAssertEqual(location!.hasFixedPrayerTime, true)
         }
-        
+
         // Test (Qasre, IQ) which has fixed prayer times by city mapper.
-        locationHelper.geocoder(countryCode: "IQ", city: "Qasre") { location in
+        locationHelper.geocoder(countryCode: "IQ", locationName: "Qasre") { location in
             XCTAssertNotNil(location)
             XCTAssertEqual(location!.latitude, 36.557804)
             XCTAssertEqual(location!.longitude, 44.827805)
@@ -66,36 +65,36 @@ class LocationTests: XCTestCase {
 
     func testGeocoderLocation() {
         // Test (London, GB) which has fixed prayer times.
-        locationHelper.geocoder(latitude: 51.50853, longitude: -0.12574) { location in
+        locationHelper.reverseGeocoder(latitude: 51.50853, longitude: -0.12574) { location in
             XCTAssertNotNil(location)
-            XCTAssertEqual(location!.cityName, "London")
+            XCTAssertEqual(location!.name, "London")
             XCTAssertEqual(location!.countryCode, "GB")
             XCTAssertEqual(location!.countryName, "United Kingdom")
             XCTAssertEqual(location!.hasFixedPrayerTime, true)
         }
 
         // Test (Tahran, IR) which hasn't fixed prayer times.
-        locationHelper.geocoder(latitude: 35.69439, longitude: 51.42151) { location in
+        locationHelper.reverseGeocoder(latitude: 35.69439, longitude: 51.42151) { location in
             XCTAssertNotNil(location)
-            XCTAssertEqual(location!.cityName, "Tehran")
+            XCTAssertEqual(location!.name, "Tehran")
             XCTAssertEqual(location!.countryCode, "IR")
             XCTAssertEqual(location!.countryName, "Iran")
             XCTAssertEqual(location!.hasFixedPrayerTime, false)
         }
 
         // Test (Soran, IQ) which has fixed prayer times by city mapper.
-        locationHelper.geocoder(latitude: 36.652686, longitude: 44.541427) { location in
+        locationHelper.reverseGeocoder(latitude: 36.652686, longitude: 44.541427) { location in
             XCTAssertNotNil(location)
-            XCTAssertEqual(location!.cityName, "Soran")
+            XCTAssertEqual(location!.name, "Soran")
             XCTAssertEqual(location!.countryCode, "IQ")
             XCTAssertEqual(location!.countryName, "Iraq")
             XCTAssertEqual(location!.hasFixedPrayerTime, true)
         }
-        
+
         // Test (Qasre, IQ) which has fixed prayer times by city mapper.
-        locationHelper.geocoder(latitude: 36.557804, longitude: 44.827805) { location in
+        locationHelper.reverseGeocoder(latitude: 36.557804, longitude: 44.827805) { location in
             XCTAssertNotNil(location)
-            XCTAssertEqual(location!.cityName, "Qasre")
+            XCTAssertEqual(location!.name, "Qasre")
             XCTAssertEqual(location!.countryCode, "IQ")
             XCTAssertEqual(location!.countryName, "Iraq")
             XCTAssertEqual(location!.hasFixedPrayerTime, true)
diff --git a/Example/Tests/NamesTest.swift b/Example/Tests/NamesTest.swift
index a764601..2d88034 100755
--- a/Example/Tests/NamesTest.swift
+++ b/Example/Tests/NamesTest.swift
@@ -6,11 +6,10 @@
 //  Copyright © 2018 CocoaPods. All rights reserved.
 //
 
-import XCTest
 @testable import MuslimData
+import XCTest
 
 class NamesTest: XCTestCase {
-
     override func setUp() {
         // Put setup code here. This method is called before the invocation of each test method in the class.
     }
diff --git a/Example/Tests/PrayerTests.swift b/Example/Tests/PrayerTests.swift
index b8b0929..0d778b4 100755
--- a/Example/Tests/PrayerTests.swift
+++ b/Example/Tests/PrayerTests.swift
@@ -6,11 +6,10 @@
 //  Copyright © 2018 CocoaPods. All rights reserved.
 //
 
-import XCTest
 @testable import MuslimData
+import XCTest
 
 class PrayerTests: XCTestCase {
-
     var attributes: PrayerAttribute!
     var date: Date!
     var offsets: [Double]!
@@ -18,8 +17,8 @@ class PrayerTests: XCTestCase {
     override func setUp() {
         super.setUp()
         // Put setup code here. This method is called before the invocation of each test method in the class.
-        date = Date(timeIntervalSince1970: 1538956800) // 2018/10/08
-        offsets = [1,1,1,-1,-1,-1]
+        date = Date(timeIntervalSince1970: 1_538_956_800) // 2018/10/08
+        offsets = [1, 1, 1, -1, -1, -1]
         attributes = PrayerAttribute(method: .makkah, asrMethod: .shafii, adjustAngle: .angleBased, offsets: offsets)
     }
 
@@ -32,21 +31,21 @@ class PrayerTests: XCTestCase {
 
     func testAllFixedPrayerTimes() {
         let locations = LocationHelper.shared.fixedPrayerTimesList()
-        let date = Date(timeIntervalSince1970: 1709206718) // 2024/02/29
-        locations!.forEach({ location in
+        let date = Date(timeIntervalSince1970: 1_709_206_718) // 2024/02/29
+        locations!.forEach { location in
             print(location)
             print(date)
             PrayerTime.getPrayerTimes(location: location, date: date, attributes: self.attributes) { prayer, error in
                 XCTAssertNil(error)
                 XCTAssertNotNil(prayer)
             }
-        })
+        }
     }
-    
+
     func testFixedPrayer() {
         // Test fixed prayer times for Sulav, Iraq
-        let sulav = Location(latitude: 0.0, longitude: 0.0, cityName: "Sulav", countryCode: "IQ",
-                             countryName: "Iraq", hasFixedPrayerTime: true)
+        let sulav = Location(id: 77342, name: "Sulav", latitude: 0.0, longitude: 0.0, countryCode: "IQ",
+                             countryName: "Iraq", hasFixedPrayerTime: true, prayerDependentId: 77349)
         PrayerTime.getPrayerTimes(location: sulav, date: date, attributes: attributes) { prayer, error in
             XCTAssertNil(error)
             XCTAssertNotNil(prayer)
@@ -60,8 +59,8 @@ class PrayerTests: XCTestCase {
         }
 
         // Test fixed prayer times for Erbil, Iraq
-        let erbil = Location(latitude: 0.0, longitude: 0.0, cityName: "Erbil", countryCode: "IQ",
-                             countryName: "Iraq", hasFixedPrayerTime: true)
+        let erbil = Location(id: 77359, name: "Erbil", latitude: 0.0, longitude: 0.0, countryCode: "IQ",
+                             countryName: "Iraq", hasFixedPrayerTime: true, prayerDependentId: nil)
         PrayerTime.getPrayerTimes(location: erbil, date: date, attributes: attributes) { prayer, error in
             XCTAssertNil(error)
             XCTAssertNotNil(prayer)
@@ -75,8 +74,8 @@ class PrayerTests: XCTestCase {
         }
 
         // Test fixed prayer times for Baghdad, Iraq
-        let baghdad = Location(latitude: 0.0, longitude: 0.0, cityName: "Baghdad", countryCode: "IQ",
-                             countryName: "Iraq", hasFixedPrayerTime: true)
+        let baghdad = Location(id: 77452, name: "Baghdad", latitude: 0.0, longitude: 0.0, countryCode: "IQ",
+                               countryName: "Iraq", hasFixedPrayerTime: true, prayerDependentId: nil)
         PrayerTime.getPrayerTimes(location: baghdad, date: date, attributes: attributes) { prayer, error in
             XCTAssertNil(error)
             XCTAssertNotNil(prayer)
@@ -91,8 +90,8 @@ class PrayerTests: XCTestCase {
         }
 
         // Test fixed prayer times for Sanandaj, Iran
-        let sanandaj = Location(latitude: 0.0, longitude: 0.0, cityName: "Sanandaj", countryCode: "IR",
-                             countryName: "Iran", hasFixedPrayerTime: true)
+        let sanandaj = Location(id: 154_907, name: "Sanandaj", latitude: 0.0, longitude: 0.0, countryCode: "IR",
+                                countryName: "Iran", hasFixedPrayerTime: true, prayerDependentId: nil)
         PrayerTime.getPrayerTimes(location: sanandaj, date: date, attributes: attributes) { prayer, error in
             XCTAssertNil(error)
             XCTAssertNotNil(prayer)
@@ -104,10 +103,10 @@ class PrayerTests: XCTestCase {
             XCTAssertEqual(stringPrayer[4], "18:04")
             XCTAssertEqual(stringPrayer[5], "19:19")
         }
-        
+
         // Test fixed prayer times for Qasre, Iraq
-        let qasre = Location(latitude: 0.0, longitude: 0.0, cityName: "Qasre", countryCode: "IQ",
-                             countryName: "Iraq", hasFixedPrayerTime: true)
+        let qasre = Location(id: 166_502, name: "Qasre", latitude: 0.0, longitude: 0.0, countryCode: "IQ",
+                             countryName: "Iraq", hasFixedPrayerTime: true, prayerDependentId: nil)
         PrayerTime.getPrayerTimes(location: qasre, date: date, attributes: attributes) { prayer, error in
             XCTAssertNil(error)
             XCTAssertNotNil(prayer)
@@ -123,8 +122,8 @@ class PrayerTests: XCTestCase {
 
     func testCalculatedPrayer() {
         // Test calculated prayer times for Mecca, Saudi Arabia
-        let mecca = Location(latitude: 21.42664, longitude: 39.82563, cityName: "Mecca", countryCode: "SA",
-                             countryName: "Saudi Arabia", hasFixedPrayerTime: false)
+        let mecca = Location(id: 119_496, name: "Mecca", latitude: 21.42664, longitude: 39.82563, countryCode: "SA",
+                             countryName: "Saudi Arabia", hasFixedPrayerTime: false, prayerDependentId: nil)
         PrayerTime.getPrayerTimes(location: mecca, date: date, attributes: attributes) { prayer, error in
             XCTAssertNil(error)
             XCTAssertNotNil(prayer)
diff --git a/MIGRATION_GUIDE.md b/MIGRATION_GUIDE.md
new file mode 100644
index 0000000..fe9e485
--- /dev/null
+++ b/MIGRATION_GUIDE.md
@@ -0,0 +1,58 @@
+# Migration Guide
+
+## MuslimDate Version 1.x to 2.x
+
+### Introduction
+This migration guide assists developers in transitioning from version 1.x to version 2.x of the `muslim-data-ios` library. Version 2 introduces improvements in database schema and table relations, including changes to the `Location` object structure.
+
+### Changes Overview
+- Improved database table normalization and rearranged table relations.
+- Restructured the `Location` object schema for better data management and consistency.
+
+### Migration Steps
+**Update Location Object**
+- Modify the `Location` object structure in your code to align with version 2.x.
+  ```swift
+  // Version 1.x
+  public struct Location {
+      public let latitude: Double
+      public let longitude: Double
+      public let cityName: String
+      public let countryCode: String
+      public let countryName: String
+      public var hasFixedPrayerTime: Bool
+  }
+  
+  // Version 2.x
+  public struct Location {
+      public let id: Int
+      public let name: String
+      public let latitude: Double
+      public let longitude: Double
+      public let countryCode: String
+      public let countryName: String
+      public var hasFixedPrayerTime: Bool
+      public let prayerDependentId: Int?
+  }
+  ```
+  - Add the `id` and `name` properties to the `Location` object to ensure consistency with the updated schema.
+  - Update any references to the `Location` object throughout your codebase to use the new structure.
+
+**Geocoding locations** 
+- One of the geocoding locations has been changed from `geocoder(latitude: Double, longitude: Double)` to `reverseGeocoder(latitude: Double, longitude: Double)`.
+
+**Location Retrieval and Prayer Times**
+- Update any methods or functions responsible for fetching user locations, geocoding, reverse geocoding, and obtaining prayer times to use the new `Location` object structure.
+
+### Compatibility Notes
+- Version 2.x maintains backward compatibility with existing projects using version 1.x, but requires modifications to the `Location` object structure.
+- Ensure all dependencies and integrations with the library are updated to version 2.x to avoid compatibility issues.
+
+### Testing Recommendations
+- Thoroughly test your application after implementing the migration steps to ensure compatibility and functionality with the updated library version.
+
+### Feedback
+- Report any migration issues or suggestions for improvement [here](https://github.com/kosratdev/muslim-data-ios/issues).
+
+### Versioning Information
+- `muslim-data-ios` follows semantic versioning. Future updates will maintain backward compatibility whenever possible.
diff --git a/MuslimData/Assets/CHANGELOG.md b/MuslimData/Assets/CHANGELOG.md
index b824685..8b7e7eb 100644
--- a/MuslimData/Assets/CHANGELOG.md
+++ b/MuslimData/Assets/CHANGELOG.md
@@ -4,6 +4,29 @@ All notable changes to the MuslimData database will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.0] - 2024-03-09
+
+Refactor database tables to improve table normalization and handle city mapper in the database level.
+
+### Added
+- `country_id` as a foreign key added to the `location` (or `city`) table to make a relation with `country` table.
+- `prayer_dependent_id` field added to the `location` table to handle city mapper in the database level. 
+- `location_id` as a foreign key added to the `prayer_time` table to make a relation with `location` table.
+ 
+### Changed
+- `city` table name has been renamed to `location`. 
+- `country_code` has been removed in the `location` table and the `country_id` field is used for the relationship between `location` and `country` tables.
+- The `city` field in the `location` table has been renamed to `name` as it holds different types of locations like governorate, city, sub-city, village, etc. 
+- `country` table fields have been refactored by removing the country suffix before the fields.
+- `country_code` and `city` fields have been removed in the `prayer_time` table and used `location_id` to make the relationship between `prayer_time` and `location` tables.
+- Database indices have been refactored as shown blow: 
+    - `country` table has `code_index` for indexing `code` column. 
+    - `location` table has has two indices as listed below: 
+      - `location_lat_long_index` for indexing `latitude` and `longitude` columns.
+      - `location_name_index` for indexing `name` column.
+    - `prayer_time` table has `prayer_index` for indexing `location_id`, `date` columns.
+- Khanaqin, IQ prayer times has been updated.
+
 ## [1.5.0] - 2024-03-04
 
 Update Chamchamal prayer times. 
diff --git a/MuslimData/Assets/cityMapper.json b/MuslimData/Assets/cityMapper.json
deleted file mode 100755
index 0b7951e..0000000
--- a/MuslimData/Assets/cityMapper.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "IQ": {
-        "Duhok": ["Sumel", "Zawita", "Atrish", "Sharya", "Mrebah"],
-        "Akre": ["Amedi", "Sulav", "Kani", "Sheladiz", "Barzan", "Bele", "Shanidar", "Bujal", "Mergin","Susna", "Sersink"],
-        "Bardarash": ["Mamuzin"],
-        "Erbil": ["Kalak", "Pirmam", "Shaqlawa", "Harir", "Khalifan", "Rawanduz", "Soran", "Mergasur", "Galala", "Choman", "Hiran", "Qushtapa", "Kasnazan"],
-        "Qasre": ["Wallze","Soraban","Shnawa","Rashdur","Makosan","Saya","Walash","Eskawa","Xazena","Dilman",
-            "Sarkan", "Chomsak","Qalat","Koila","Mawnan","Wasan","Choma","Mergay Khwaru","Kani bast"],
-        "Kirkuk": ["Taza Khurmatu"],
-        "Sulaymaniyah": ["Mawat", "Arbat"],
-        "Qaladiza": ["Halsho", "Nawdasht", "Tasluja", "Bazian", "Sangasar", "Zharawa", "Bngrd", "Hero"],
-        "Dokan": ["Piramagroon"],
-        "Ranya": ["Hajiawa", "Sarkapkan", "Khalakan", "Taqtaq", "Hizop", "Chwarqurna"],
-        "Chamchamal": ["Takiya", "Takiay Jabari", "Shorsh", "Aghjalar", "Sangaw"],
-        "Darbandikhan": ["Zalan", "Gapilon", "Chwarta", "Barzinjah", "Zarayan", "Halebjai Taza","Qara Dagh"],
-        "Penjwen": ["Garmk", "Nalparez", "Said Sadiq", "Pshta"],
-        "Halabja": ["Sirwan", "Byara", "Tawella", "Balkha", "Khurmal"]
-    },
-    "IR":{
-        "Sanandaj": ["Kamyaran", "Divandarreh", "Dehgolan", "Qorveh"],
-        "Urmia": ["Orumiyeh"]
-    },
-    "KW": {
-        "Al Asimah": ["Kuwait City", "Dasman Palace", "Sharq", "Mirqab", "Jibla", "Dasma", "Daiya", "Salhia", "Bneid Al Qar", "Kaifan", "Mansouriya", "Abdullah al-Salem", "Nuzha", "Faiha", "Shamiya", "Rawda", "Adailiya", "Khaldiya", "Qadsiya", "Qortuba", "Surra", "Yarmouk", "Shuwaikh Industrial", "Rai", "Granada", "Sulaibikhat", "Doha", "Nahdha", "Jaber Al Ahmad", "Qairawan", "Ahmadi", "Al Wafrah", "Sabah Al Salem", "Messila", "Al-Masayel", "Adan", "Fnaitees", "Qusor", "Qurain", "Abu Fatira", "Mubarak Al Kabeer", "Jeleeb Al-Shuyoukh", "Eqaila", "Fintas", "Dahar", "Mahboula", "Hadiya", "Al-Riqqa", "Abu Halifa", "Fahad Al Ahmad", "Assabahiyah", "Mangaf", "Fahaheel", "South Sabahiya", "Ali Sabah Al Salem", "Shalayhat Mina Abdullah", "Zour", "Al Khiran"],
-        "Failaka Island": ["Zoor", "Kubbar Island", "Al-Nuwaiseeb"],
-        "Abdali": ["Jahra"]
-    }
-}
diff --git a/MuslimData/Assets/muslim_db_v1.5.0.db b/MuslimData/Assets/muslim_db_v2.0.0.db
similarity index 63%
rename from MuslimData/Assets/muslim_db_v1.5.0.db
rename to MuslimData/Assets/muslim_db_v2.0.0.db
index e4ca36a..c655d26 100644
Binary files a/MuslimData/Assets/muslim_db_v1.5.0.db and b/MuslimData/Assets/muslim_db_v2.0.0.db differ
diff --git a/MuslimData/Classes/DB Helper/DBHelper.swift b/MuslimData/Classes/DB Helper/DBHelper.swift
index 24eb3b2..694c8b6 100755
--- a/MuslimData/Classes/DB Helper/DBHelper.swift	
+++ b/MuslimData/Classes/DB Helper/DBHelper.swift	
@@ -19,7 +19,7 @@ class DBHelper {
     private init() {
         var configuration = Configuration()
         configuration.readonly = true
-        let databaseURL = Bundle(for: DBHelper.self).path(forResource: "muslim_db_v1.5.0", ofType: "db")!
+        let databaseURL = Bundle(for: DBHelper.self).path(forResource: "muslim_db_v2.0.0", ofType: "db")!
         dbPool = try? DatabasePool(path: databaseURL, configuration: configuration)
 
         // Be a nice iOS citizen, and don’t consume too much memory
@@ -29,12 +29,12 @@ class DBHelper {
 
     // MARK: - Public Methods
 
-    func prayerTimes(countryCode: String, city: String, date: Date, callback: @escaping (Row?, String?) -> Void) {
+    func prayerTimes(location: Location, date: Date, callback: @escaping (Row?, String?) -> Void) {
         do {
             try dbPool?.read { dbConnect in
                 let result = try Row.fetchOne(dbConnect, sql: """
                 SELECT * FROM prayer_time
-                WHERE country_code = "\(countryCode)" and city = "\(city.mapper(countryCode: countryCode))"
+                WHERE location_id = "\(location.prayerDependentId ?? location.id)"
                 and date = "\(formatPrayerDate(date))"
                 """)
                 guard let row = result else {
diff --git a/MuslimData/Classes/Extensions/DateExtensions.swift b/MuslimData/Classes/Extensions/DateExtensions.swift
index 50d81c9..8c6d149 100755
--- a/MuslimData/Classes/Extensions/DateExtensions.swift
+++ b/MuslimData/Classes/Extensions/DateExtensions.swift
@@ -34,7 +34,7 @@ public extension Date {
     func addMinutes(_ minutes: Double) -> Date {
         addingTimeInterval(60 * minutes)
     }
-    
+
     /// Add hours to the date.
     ///
     /// - Parameter hours: hours to be added to the date.
diff --git a/MuslimData/Classes/Location/Location.swift b/MuslimData/Classes/Location/Location.swift
index d020fd5..51cecc6 100755
--- a/MuslimData/Classes/Location/Location.swift
+++ b/MuslimData/Classes/Location/Location.swift
@@ -10,42 +10,50 @@ import GRDB
 
 /// Location model that holds a location information.
 public struct Location: FetchableRecord {
+    public let id: Int
+    public let name: String
     public let latitude: Double
     public let longitude: Double
-    public let cityName: String
     public let countryCode: String
     public let countryName: String
     public var hasFixedPrayerTime: Bool
+    public let prayerDependentId: Int?
 
     /// get columns from db.
     enum Columns {
+        static let id = Column("_id")
+        static let name = Column("name")
         static let latitude = Column("latitude")
         static let longitude = Column("longitude")
-        static let cityName = Column("city_name")
         static let countryCode = Column("country_code")
         static let countryName = Column("country_name")
         static let hasFixedPrayerTime = Column("has_fixed_prayer_time")
+        static let prayerDependentId = Column("prayer_dependent_id")
     }
 
     /// put columns to row.
     ///
     /// - Parameter row: Row
     public init(row: Row) {
+        id = row[Columns.id]
+        name = row[Columns.name]
         latitude = row[Columns.latitude]
         longitude = row[Columns.longitude]
-        cityName = row[Columns.cityName]
         countryCode = row[Columns.countryCode]
         countryName = row[Columns.countryName]
         hasFixedPrayerTime = row[Columns.hasFixedPrayerTime]
+        prayerDependentId = row[Columns.prayerDependentId]
     }
 
-    public init(latitude: Double, longitude: Double, cityName: String,
-                countryCode: String, countryName: String, hasFixedPrayerTime: Bool) {
+    public init(id: Int, name: String, latitude: Double, longitude: Double, countryCode: String,
+                countryName: String, hasFixedPrayerTime: Bool, prayerDependentId: Int?) {
+        self.id = id
         self.latitude = latitude
         self.longitude = longitude
-        self.cityName = cityName
+        self.name = name
         self.countryCode = countryCode
         self.countryName = countryName
         self.hasFixedPrayerTime = hasFixedPrayerTime
+        self.prayerDependentId = prayerDependentId
     }
 }
diff --git a/MuslimData/Classes/Location/LocationHelper.swift b/MuslimData/Classes/Location/LocationHelper.swift
index 0bd8642..257f875 100755
--- a/MuslimData/Classes/Location/LocationHelper.swift
+++ b/MuslimData/Classes/Location/LocationHelper.swift
@@ -25,18 +25,18 @@ public struct LocationHelper {
     /// Search for a city in the database
     ///
     /// - Parameters:
-    ///   - city: City name
+    ///   - locationName: location name
     ///   - callback: Callback that returns a Location object.
-    public func citySearch(_ city: String, callback: @escaping ([Location]?, String?) -> Void) {
+    public func citySearch(_ locationName: String, callback: @escaping ([Location]?, String?) -> Void) {
         DispatchQueue.global(qos: .background).async {
             do {
                 try self.dbHelper.dbPool?.read { dbConnect in
                     let locations = try Location.fetchAll(dbConnect, sql: """
-                    SELECT city.country_code as country_code, country_name, city_name,
-                           latitude, longitude, has_fixed_prayer_time
-                    FROM city
-                    INNER JOIN country on city.country_code = country.country_code
-                    WHERE city.city_name like "\(city)%"
+                    SELECT location._id as _id, country.code as country_code, country.name as country_name,
+                           location.name as name, latitude, longitude, has_fixed_prayer_time, prayer_dependent_id
+                    FROM location
+                    INNER JOIN country on country._id = location.country_id
+                    WHERE location.name like "\(locationName)%"
                     """)
                     DispatchQueue.main.async {
                         callback(locations, nil)
@@ -56,15 +56,15 @@ public struct LocationHelper {
     ///   - countryCode: Country code
     ///   - city: City name
     ///   - callback: Callback that returns a Location object.
-    public func geocoder(countryCode: String, city: String, callback: @escaping (Location?) -> Void) {
+    public func geocoder(countryCode: String, locationName: String, callback: @escaping (Location?) -> Void) {
         do {
             try dbHelper.dbPool?.read { dbConnect in
                 let result = try Location.fetchOne(dbConnect, sql: """
-                SELECT city.country_code as country_code, country_name, city_name, latitude,
-                       longitude, has_fixed_prayer_time
-                FROM city
-                INNER JOIN country on city.country_code = country.country_code
-                WHERE city.country_code="\(countryCode)" COLLATE NOCASE and city.city_name="\(city)" COLLATE NOCASE
+                SELECT location._id as _id, country.code as country_code, country.name as country_name,
+                       location.name as name, latitude, longitude, has_fixed_prayer_time, prayer_dependent_id
+                FROM location
+                INNER JOIN country on country._id = location.country_id
+                WHERE country.code="\(countryCode)" COLLATE NOCASE and location.name="\(locationName)" COLLATE NOCASE
                 """)
 
                 guard var location = result else {
@@ -85,14 +85,14 @@ public struct LocationHelper {
     ///   - latitude: City latitude.
     ///   - longitude: City longitude.
     ///   - callback: Callback that returns a Location object.
-    public func geocoder(latitude: Double, longitude: Double, callback: @escaping (Location?) -> Void) {
+    public func reverseGeocoder(latitude: Double, longitude: Double, callback: @escaping (Location?) -> Void) {
         do {
             try dbHelper.dbPool?.read { dbConnect in
                 let result = try Location.fetchOne(dbConnect, sql: """
-                SELECT city.country_code as country_code, country_name, city_name, latitude,
-                       longitude, has_fixed_prayer_time
-                FROM city
-                INNER JOIN country on city.country_code = country.country_code
+                SELECT location._id as _id, country.code as country_code, country.name as country_name,
+                       location.name as name, latitude, longitude, has_fixed_prayer_time, prayer_dependent_id
+                FROM location
+                INNER JOIN country on country._id = location.country_id
                 ORDER BY abs(latitude - (\(latitude))) + abs(longitude - (\(longitude)))
                 LIMIT 1
                 """)
@@ -108,17 +108,17 @@ public struct LocationHelper {
             callback(nil)
         }
     }
-    
+
     /// Get all the locations that has fixed prayer times.
     /// - Returns: Location list
-    public func fixedPrayerTimesList() -> [Location]?{
+    public func fixedPrayerTimesList() -> [Location]? {
         do {
             return try self.dbHelper.dbPool?.read { dbConnect in
                 let locations = try Location.fetchAll(dbConnect, sql: """
-                SELECT city.country_code as country_code, country_name, city_name,
-                       latitude, longitude, has_fixed_prayer_time
-                FROM city
-                INNER JOIN country on city.country_code = country.country_code
+                SELECT location._id as _id, country.code as country_code, country.name as country_name,
+                       location.name as name, latitude, longitude, has_fixed_prayer_time, prayer_dependent_id
+                FROM location
+                INNER JOIN country on country._id = location.country_id
                 WHERE has_fixed_prayer_time=1
                 """)
                return locations
diff --git a/MuslimData/Classes/Prayer Times/PrayerTime.swift b/MuslimData/Classes/Prayer Times/PrayerTime.swift
index ace78d9..d7dede3 100755
--- a/MuslimData/Classes/Prayer Times/PrayerTime.swift	
+++ b/MuslimData/Classes/Prayer Times/PrayerTime.swift	
@@ -31,13 +31,13 @@ public struct PrayerTime {
         maghrib = maghrib.addMinutes(offsets[4])
         isha = isha.addMinutes(offsets[5])
     }
-    
+
     /// Apply daylight saving time to the current prayer times.
     private mutating func applyDST() {
-        
+
         let isDST = TimeZone.current.isDaylightSavingTime()
-        
-        if (isDST) {
+
+        if isDST {
             fajr = fajr.addHours(1)
             sunrise = sunrise.addHours(1)
             dhuhr = dhuhr.addHours(1)
@@ -46,7 +46,7 @@ public struct PrayerTime {
             isha = isha.addHours(1)
         }
     }
-    
+
     // MARK: - Public Methods
 
     /// Get prayer times from the prayer database.
@@ -82,9 +82,7 @@ public struct PrayerTime {
             return
         }
 
-        DBHelper.shared.prayerTimes(countryCode: location.countryCode,
-                                    city: location.cityName,
-                                    date: date) { row, error in
+        DBHelper.shared.prayerTimes(location: location, date: date) { row, error in
             guard error == nil else {
                 callback(nil, error)
                 return
diff --git a/README.md b/README.md
index d38b9ca..8e9fa7e 100755
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # MuslimData
 
-[![CI Status](https://img.shields.io/travis/KosratDAhmad/MuslimData.svg?style=flat)](https://travis-ci.org/KosratDAhmad/MuslimData)
+[![Build Status](https://github.com/kosratdev/muslim-data-ios/actions/workflows/deploy_to_cocoapods.yml/badge.svg)](https://github.com/kosratdev/muslim-data-ios/actions)
 [![Version](https://img.shields.io/cocoapods/v/MuslimData.svg?style=flat)](https://cocoapods.org/pods/MuslimData)
 [![License](https://img.shields.io/cocoapods/l/MuslimData.svg?style=flat)](https://cocoapods.org/pods/MuslimData)
 [![Platform](https://img.shields.io/cocoapods/p/MuslimData.svg?style=flat)](https://cocoapods.org/pods/MuslimData)
@@ -10,11 +10,14 @@ MuslimData is an Islamic library that provides Prayer Times (fixed and calculate
 **Fixed and Calculated Prayer Times**:
 Most cities around the world find their prayer times by using some calculations which is based on location (longitude and latitude) but some other cities have fixed time table for their prayer times. This library contains most fixed and calculated prayer times. Now you can contribute it to improve it and also you can use it in Muslim communities or Muslim apps.
 
+## Migration Guide
+If you're upgrading from version 1.x to version 2.x of `muslim-data-ios`, please refer to the [Migration Guide](MIGRATION_GUIDE.md) for detailed instructions on updating your code to accommodate the changes in the latest release.
+
 ## Example
 
 To run the example project, clone the repo, and run `pod install` from the Example directory first.
 
-<img width="40%" src="https://raw.githubusercontent.com/KosratDAhmad/MuslimData/develop/screenshots/1-prayer-times.png" /> <img width="40%" src="https://raw.githubusercontent.com/KosratDAhmad/MuslimData/develop/screenshots/2-locations.png" /> <img width="40%" src="https://raw.githubusercontent.com/KosratDAhmad/MuslimData/develop/screenshots/3-names.png" /> <img width="40%" src="https://raw.githubusercontent.com/KosratDAhmad/MuslimData/develop/screenshots/4-azkars.png" /> <img width="40%" src="https://raw.githubusercontent.com/KosratDAhmad/MuslimData/develop/screenshots/5-azkar-detail.png" />
+<img width="40%" src="https://raw.githubusercontent.com/kosratdev/muslim-data-ios/main/screenshots/1-prayer-times.png" /> <img width="40%" src="https://raw.githubusercontent.com/kosratdev/muslim-data-ios/main/screenshots/2-locations.png" /> <img width="40%" src="https://raw.githubusercontent.com/kosratdev/muslim-data-ios/main/screenshots/3-names.png" /> <img width="40%" src="https://raw.githubusercontent.com/kosratdev/muslim-data-ios/main/screenshots/4-azkars.png" /> <img width="40%" src="https://raw.githubusercontent.com/kosratdev/muslim-data-ios/main/screenshots/5-azkar-detail.png" />
 
 ## Requirements