diff --git a/src/jobspy/db/job_repository.py b/src/jobspy/db/job_repository.py
index e88a904..a10c7f2 100644
--- a/src/jobspy/db/job_repository.py
+++ b/src/jobspy/db/job_repository.py
@@ -16,23 +16,12 @@ class JobRepository:
         # Access a collection
         self.collection = self.db["jobs"]
 
-    def insert_or_update_job(self, job: JobPost):
+    def insert_job(self, job: JobPost):
         # Convert JobPost to dictionary
         job_dict = job.model_dump(exclude={"date_posted"})
-
-        # Check if the job already exists by its ID
-        if job.id:
-            # If it exists, update the `updated_at` field and other fields
-            # job_dict['updated_at'] = datetime.utcnow()  # Set updated time to current time
-            self.collection.update_one(
-                {'_id': job.id},
-                {'$set': job_dict}
-            )
-            print(f"Updated job with ID {job.id}.")
-        else:
-            # If it doesn't exist, insert a new job with the current `created_at` and `updated_at`
-            self.collection.insert_one(job_dict)
-            print(f"Inserted new job with title {job.title}.")
+        # If it doesn't exist, insert a new job with the current `created_at` and `updated_at`
+        self.collection.insert_one(job_dict)
+        print(f"Inserted new job with title {job.title}.")
 
     def insertManyIfNotFound(self, jobs: List[JobPost]) -> List[JobPost]:
         """
diff --git a/src/jobspy/jobs/__init__.py b/src/jobspy/jobs/__init__.py
index dc9d6d9..b96f2c0 100644
--- a/src/jobspy/jobs/__init__.py
+++ b/src/jobspy/jobs/__init__.py
@@ -88,7 +88,7 @@ class Country(Enum):
     INDIA = ("india", "in", "co.in")
     INDONESIA = ("indonesia", "id")
     IRELAND = ("ireland", "ie", "ie")
-    ISRAEL = ("israel", "il","com")
+    ISRAEL = ("israel", "il", "com")
     ITALY = ("italy", "it", "it")
     JAPAN = ("japan", "jp")
     KUWAIT = ("kuwait", "kw")
@@ -165,9 +165,21 @@ class Country(Enum):
                 return country
         valid_countries = [country.value for country in cls]
         raise ValueError(
-            f"Invalid country string: '{country_str}'. Valid countries are: {', '.join([country[0] for country in valid_countries])}"
+            f"Invalid country string: '{country_str}'. Valid countries are: {
+                ', '.join([country[0] for country in valid_countries])}"
         )
 
+    def to_dict(self):
+        return {
+            "name": self.value[0].split(",")
+        }
+
+    @staticmethod
+    def from_dict(data):
+        if not data:
+            return None
+        return Country[data["name"]]
+
 
 class Location(BaseModel):
     country: Country | str | None = None
@@ -195,6 +207,19 @@ class Location(BaseModel):
                 location_parts.append(country_name.title())
         return ", ".join(location_parts)
 
+    def model_dump(self):
+        # Convert the model into a dictionary and serialize the country enum
+        data = super().model_dump()
+        if self.country:
+            data['country'] = self.country.to_dict()
+        return data
+
+    @staticmethod
+    def model_load(data):
+        if 'country' in data:
+            data['country'] = Country.from_dict(data['country'])
+        return Location(**data)
+
 
 class CompensationInterval(Enum):
     YEARLY = "yearly"
@@ -264,9 +289,18 @@ class JobPost(BaseModel):
     # linkedin only atm
     job_function: str | None = None
 
-    class Config:
-        # Exclude `date_posted` in model dumps
-        exclude = {"date_posted"}
+    def model_dump(self, exclude: set = None):
+        # Use `Location`'s custom serialization logic
+        data = super().model_dump(exclude=exclude)
+        if self.location:
+            data['location'] = self.location.model_dump()
+        return data
+
+    @staticmethod
+    def model_load(data):
+        if 'location' in data:
+            data['location'] = Location.model_load(data['location'])
+        return JobPost(**data)
 
 
 class JobResponse(BaseModel):
diff --git a/src/jobspy/main.py b/src/jobspy/main.py
index 4af0723..b51a827 100644
--- a/src/jobspy/main.py
+++ b/src/jobspy/main.py
@@ -22,13 +22,11 @@ async def main():
     )
     print(f"Found {len(jobs)} jobs")
 
-    for job in jobs:
-        jobRepository.insert_or_update_job(job)
+    new_jobs = jobRepository.insertManyIfNotFound(jobs)
 
-    # new_jobs = jobRepository.insertManyIfNotFound(jobs, jobs_collection)
+    for new_job in new_jobs:
+        await telegramBot.send_job(new_job)
 
-    # for new_job in new_jobs:
-    #     await telegramBot.send_job(new_job)
-    # Run the async main function
+# Run the async main function
 if __name__ == "__main__":
     asyncio.run(main())
diff --git a/src/tests/test_db.py b/src/tests/test_db.py
index a624ab3..27ebda1 100644
--- a/src/tests/test_db.py
+++ b/src/tests/test_db.py
@@ -16,8 +16,8 @@ class DatabaseTests:
         Inserts a mock job into the database using JobRepository.
         """
         job = createMockJob()
-        self.jobRepository.insert_or_update_job(job)
-        print("Job inserted successfully.")
+        self.jobRepository.insert_job(job)
+        print(f"Job inserted successfully.{job.id}")
 
 
 if __name__ == '__main__':
diff --git a/src/tests/test_util.py b/src/tests/test_util.py
index 74b33f1..07f1b7d 100644
--- a/src/tests/test_util.py
+++ b/src/tests/test_util.py
@@ -1,9 +1,6 @@
 from datetime import datetime, date
 from typing import List
-
-from telegram import Location
-
-from jobspy.jobs import Country, JobPost
+from jobspy.jobs import Country, JobPost, Location
 # Creating some test job posts