diff --git a/collect_app/src/main/java/org/fieldsight/naxa/common/FieldSightNotificationUtils.java b/collect_app/src/main/java/org/fieldsight/naxa/common/FieldSightNotificationUtils.java
index dff0ac2af..3ed783f9e 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/common/FieldSightNotificationUtils.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/common/FieldSightNotificationUtils.java
@@ -16,7 +16,7 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-
+@SuppressWarnings("PMD.UseNotifyAllInsteadOfNotify")
 public class FieldSightNotificationUtils {
     private NotificationManager notifManager;
     private static final String CHANNEL_ID = "fieldsight_notification_channel";
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/common/SiteOverideLocalSource.java b/collect_app/src/main/java/org/fieldsight/naxa/common/SiteOverideLocalSource.java
index a20f79cc9..9f58e947b 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/common/SiteOverideLocalSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/common/SiteOverideLocalSource.java
@@ -1,6 +1,7 @@
 package org.fieldsight.naxa.common;
 
 import androidx.lifecycle.LiveData;
+
 import android.os.AsyncTask;
 
 import org.odk.collect.android.application.Collect;
@@ -25,13 +26,11 @@ private SiteOverideLocalSource() {
         this.siteDao = fieldSightDatabase.getSiteDAO();
     }
 
-    public static SiteOverideLocalSource getInstance() {
+    public synchronized static SiteOverideLocalSource getInstance() {
+
         if (siteOverideLocalSource == null) {
-            synchronized (SiteOverideLocalSource.class) {
-                if (siteOverideLocalSource == null) {
-                    siteOverideLocalSource = new SiteOverideLocalSource();
-                }
-            }
+            siteOverideLocalSource = new SiteOverideLocalSource();
+
         }
         return siteOverideLocalSource;
     }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/common/ViewModelFactory.java b/collect_app/src/main/java/org/fieldsight/naxa/common/ViewModelFactory.java
index 132e5bdc1..5566b6bc6 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/common/ViewModelFactory.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/common/ViewModelFactory.java
@@ -45,7 +45,7 @@
 public class ViewModelFactory extends ViewModelProvider.NewInstanceFactory {
 
     @SuppressLint("StaticFieldLeak")
-    private static volatile ViewModelFactory viewModelFactory;
+    private static ViewModelFactory viewModelFactory;
 
     private final GeneralFormRepository generalFormRepository;
     private final ScheduledFormRepository scheduledFormRepository;
@@ -59,15 +59,15 @@ public class ViewModelFactory extends ViewModelProvider.NewInstanceFactory {
 
 
     public ViewModelFactory(
-                            GeneralFormRepository repository,
-                            ScheduledFormRepository scheduledFormRepository,
-                            StageFormRepository stageFormRepository,
-                            SubStageRepository subStageRepository,
-                            ProjectRepository projectRepository,
-                            SiteRepository siteRepository,
-                            SurveyFormRepository surveyFormRepository,
-                            FieldSightNotificationRepository notificationRepository,
-                            ContactRepository contactRepository
+            GeneralFormRepository repository,
+            ScheduledFormRepository scheduledFormRepository,
+            StageFormRepository stageFormRepository,
+            SubStageRepository subStageRepository,
+            ProjectRepository projectRepository,
+            SiteRepository siteRepository,
+            SurveyFormRepository surveyFormRepository,
+            FieldSightNotificationRepository notificationRepository,
+            ContactRepository contactRepository
     ) {
 
         this.generalFormRepository = repository;
@@ -81,30 +81,28 @@ public ViewModelFactory(
         this.contactRepository = contactRepository;
     }
 
-    public static ViewModelFactory getInstance() {
+    public static synchronized ViewModelFactory getInstance() {
 
         if (viewModelFactory == null) {
-            synchronized (ViewModelFactory.class) {
-                if (viewModelFactory == null) {
-                    GeneralFormRepository generalFormRepository = GeneralFormRepository.getInstance(
-                            GeneralFormLocalSource.getInstance(), GeneralFormRemoteSource.getInstance());
-                    ScheduledFormRepository scheduledFormRepository = ScheduledFormRepository.getInstance(
-                            ScheduledFormsLocalSource.getInstance(), ScheduledFormsRemoteSource.getInstance());
-
-                    StageFormRepository stageFormRepository = StageFormRepository.getInstance(StageLocalSource.getInstance(), StageRemoteSource.getInstance());
-                    SubStageRepository subStageRepository = SubStageRepository.getInstance(SubStageLocalSource.getInstance());
-                    ProjectRepository projectRepository = ProjectRepository.getInstance(ProjectLocalSource.getInstance(), ProjectSitesRemoteSource.getInstance());
-                    SiteRepository siteRepository = SiteRepository.getInstance(SiteLocalSource.getInstance());
-                    SurveyFormRepository surveyFormRepository = SurveyFormRepository.getInstance(SurveyFormLocalSource.getInstance());
-                    FieldSightNotificationRepository notificationRepository = FieldSightNotificationRepository.getInstance(FieldSightNotificationLocalSource.getInstance());
-                    ContactRepository contactRepository = ContactRepository.getInstance(ContactLocalSource.getInstance());
-
-
-                    viewModelFactory = new ViewModelFactory(generalFormRepository, scheduledFormRepository,
-                            stageFormRepository, subStageRepository, projectRepository, siteRepository,
-                            surveyFormRepository, notificationRepository, contactRepository);
-                }
-            }
+
+            GeneralFormRepository generalFormRepository = GeneralFormRepository.getInstance(
+                    GeneralFormLocalSource.getInstance(), GeneralFormRemoteSource.getInstance());
+            ScheduledFormRepository scheduledFormRepository = ScheduledFormRepository.getInstance(
+                    ScheduledFormsLocalSource.getInstance(), ScheduledFormsRemoteSource.getInstance());
+
+            StageFormRepository stageFormRepository = StageFormRepository.getInstance(StageLocalSource.getInstance(), StageRemoteSource.getInstance());
+            SubStageRepository subStageRepository = SubStageRepository.getInstance(SubStageLocalSource.getInstance());
+            ProjectRepository projectRepository = ProjectRepository.getInstance(ProjectLocalSource.getInstance(), ProjectSitesRemoteSource.getInstance());
+            SiteRepository siteRepository = SiteRepository.getInstance(SiteLocalSource.getInstance());
+            SurveyFormRepository surveyFormRepository = SurveyFormRepository.getInstance(SurveyFormLocalSource.getInstance());
+            FieldSightNotificationRepository notificationRepository = FieldSightNotificationRepository.getInstance(FieldSightNotificationLocalSource.getInstance());
+            ContactRepository contactRepository = ContactRepository.getInstance(ContactLocalSource.getInstance());
+
+
+            viewModelFactory = new ViewModelFactory(generalFormRepository, scheduledFormRepository,
+                    stageFormRepository, subStageRepository, projectRepository, siteRepository,
+                    surveyFormRepository, notificationRepository, contactRepository);
+
         }
         return viewModelFactory;
     }
@@ -147,11 +145,10 @@ public <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
         } else if (modelClass.isAssignableFrom(DownloadViewModel.class)) {
             //noinspection unchecked
             return (T) new DownloadViewModel();
-        }else if (modelClass.isAssignableFrom(FragmentHostViewModel.class)) {
+        } else if (modelClass.isAssignableFrom(FragmentHostViewModel.class)) {
             //noinspection unchecked
             return (T) new FragmentHostViewModel();
-        }
-        else if (modelClass.isAssignableFrom(FieldSightFormViewModel.class)) {
+        } else if (modelClass.isAssignableFrom(FieldSightFormViewModel.class)) {
             //noinspection unchecked
             return (T) new FieldSightFormViewModel();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/common/database/FieldSightConfigDatabase.java b/collect_app/src/main/java/org/fieldsight/naxa/common/database/FieldSightConfigDatabase.java
index f0b374f9c..50e683c3a 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/common/database/FieldSightConfigDatabase.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/common/database/FieldSightConfigDatabase.java
@@ -3,6 +3,7 @@
 import androidx.room.Database;
 import androidx.room.Room;
 import androidx.room.RoomDatabase;
+
 import android.content.Context;
 
 import org.odk.collect.android.application.Collect;
@@ -35,18 +36,17 @@ public abstract class FieldSightConfigDatabase extends RoomDatabase {
 
     private static final String DB_PATH = Collect.METADATA_PATH + File.separator + "fieldsight_cofig";
 
-    public static FieldSightConfigDatabase getDatabase(final Context context) {
+    public synchronized static FieldSightConfigDatabase getDatabase(final Context context) {
+
         if (fieldSightConfigDatabase == null) {
-            synchronized (FieldSightConfigDatabase.class) {
-                if (fieldSightConfigDatabase == null) {
-                    fieldSightConfigDatabase = Room.databaseBuilder(context.getApplicationContext(),
-                            FieldSightConfigDatabase.class, DB_PATH)
-                            .fallbackToDestructiveMigration()
-                            .allowMainThreadQueries()
-                            .build();
-                }
-            }
+            fieldSightConfigDatabase = Room.databaseBuilder(context.getApplicationContext(),
+                    FieldSightConfigDatabase.class, DB_PATH)
+                    .fallbackToDestructiveMigration()
+                    .allowMainThreadQueries()
+                    .build();
         }
+
+
         return fieldSightConfigDatabase;
     }
 
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/contact/ContactLocalSource.java b/collect_app/src/main/java/org/fieldsight/naxa/contact/ContactLocalSource.java
index 0ea1c8047..7df63d339 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/contact/ContactLocalSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/contact/ContactLocalSource.java
@@ -23,7 +23,7 @@ private ContactLocalSource() {
     }
 
 
-    public static ContactLocalSource getInstance() {
+    public synchronized static ContactLocalSource getInstance() {
         if (INSTANCE == null) {
             INSTANCE = new ContactLocalSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/contact/ContactRemoteSource.java b/collect_app/src/main/java/org/fieldsight/naxa/contact/ContactRemoteSource.java
index 8005eeaad..39e042775 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/contact/ContactRemoteSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/contact/ContactRemoteSource.java
@@ -16,7 +16,7 @@ public class ContactRemoteSource implements BaseRemoteDataSource<FieldSightConta
     private static ContactRemoteSource contactRemoteSource;
 
 
-    public static ContactRemoteSource getInstance() {
+    public synchronized static ContactRemoteSource getInstance() {
         if (contactRemoteSource == null) {
             contactRemoteSource = new ContactRemoteSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/contact/ContactRepository.java b/collect_app/src/main/java/org/fieldsight/naxa/contact/ContactRepository.java
index 75c9ab467..b24114235 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/contact/ContactRepository.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/contact/ContactRepository.java
@@ -15,13 +15,9 @@ public class ContactRepository implements BaseRepository<FieldSightContactModel>
     private static ContactRepository contactRepository;
 
 
-    public static ContactRepository getInstance(ContactLocalSource localSource) {
+    public static synchronized ContactRepository getInstance(ContactLocalSource localSource) {
         if (contactRepository == null) {
-            synchronized (ContactRepository.class) {
-                if (contactRepository == null) {
-                    contactRepository = new ContactRepository(localSource);
-                }
-            }
+            contactRepository = new ContactRepository(localSource);
         }
         return contactRepository;
     }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/data/source/local/FieldSightNotificationLocalSource.java b/collect_app/src/main/java/org/fieldsight/naxa/data/source/local/FieldSightNotificationLocalSource.java
index 3d28d8a23..ba6a73692 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/data/source/local/FieldSightNotificationLocalSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/data/source/local/FieldSightNotificationLocalSource.java
@@ -80,7 +80,7 @@ public class FieldSightNotificationLocalSource implements BaseLocalDataSource<Fi
     boolean isDeployedFromSite;
     String siteIdentifier;
 
-    public static FieldSightNotificationLocalSource getInstance() {
+    public synchronized static FieldSightNotificationLocalSource getInstance() {
         if (INSTANCE == null) {
             INSTANCE = new FieldSightNotificationLocalSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/educational/EducationalMaterialsLocalSource.java b/collect_app/src/main/java/org/fieldsight/naxa/educational/EducationalMaterialsLocalSource.java
index eb15492a0..2a270d518 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/educational/EducationalMaterialsLocalSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/educational/EducationalMaterialsLocalSource.java
@@ -19,7 +19,7 @@ public class EducationalMaterialsLocalSource implements BaseLocalDataSource<Em>
     private static EducationalMaterialsLocalSource educationalMaterialsLocalSource;
     private final EducationalMaterialsDao dao;
 
-    public static EducationalMaterialsLocalSource getInstance() {
+    public synchronized static EducationalMaterialsLocalSource getInstance() {
         if (educationalMaterialsLocalSource == null) {
             educationalMaterialsLocalSource = new EducationalMaterialsLocalSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/educational/EducationalMaterialsRemoteSource.java b/collect_app/src/main/java/org/fieldsight/naxa/educational/EducationalMaterialsRemoteSource.java
index 04e18ab0f..78bca4c96 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/educational/EducationalMaterialsRemoteSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/educational/EducationalMaterialsRemoteSource.java
@@ -49,7 +49,7 @@ public class EducationalMaterialsRemoteSource implements BaseRemoteDataSource<Em
     private static EducationalMaterialsRemoteSource INSTANCE;
 
 
-    public static EducationalMaterialsRemoteSource getInstance() {
+    public synchronized static EducationalMaterialsRemoteSource getInstance() {
         if (INSTANCE == null) {
             INSTANCE = new EducationalMaterialsRemoteSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/flagform/FlagFormRemoteSource.java b/collect_app/src/main/java/org/fieldsight/naxa/flagform/FlagFormRemoteSource.java
index b5ee8144c..0ab4accb8 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/flagform/FlagFormRemoteSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/flagform/FlagFormRemoteSource.java
@@ -39,7 +39,7 @@ public class FlagFormRemoteSource {
     private final FSInstancesDao instancesDao;
 
 
-    public static FlagFormRemoteSource getFlagFormRemoteSource() {
+    public synchronized static FlagFormRemoteSource getFlagFormRemoteSource() {
         if (flagFormRemoteSource == null) {
             flagFormRemoteSource = new FlagFormRemoteSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/flagform/InstanceRemoteSource.java b/collect_app/src/main/java/org/fieldsight/naxa/flagform/InstanceRemoteSource.java
index f836ca25d..c0b1078b3 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/flagform/InstanceRemoteSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/flagform/InstanceRemoteSource.java
@@ -35,7 +35,7 @@ public class InstanceRemoteSource {
     private static InstanceRemoteSource instanceRemoteSource;
 
 
-    public static InstanceRemoteSource getInstanceRemoteSource() {
+    public static synchronized InstanceRemoteSource getInstanceRemoteSource() {
         if (instanceRemoteSource == null) {
             instanceRemoteSource = new InstanceRemoteSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/forms/data/local/FieldSightFormsLocalSourcev3.java b/collect_app/src/main/java/org/fieldsight/naxa/forms/data/local/FieldSightFormsLocalSourcev3.java
index f417f0f0e..813da325e 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/forms/data/local/FieldSightFormsLocalSourcev3.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/forms/data/local/FieldSightFormsLocalSourcev3.java
@@ -37,7 +37,7 @@ private FieldSightFormsLocalSourcev3() {
         this.dao = database.getFieldSightFOrmDAOV3();
     }
 
-    public static FieldSightFormsLocalSourcev3 getInstance() {
+    public static synchronized FieldSightFormsLocalSourcev3 getInstance() {
         if (localSourcev3 == null) {
             localSourcev3 = new FieldSightFormsLocalSourcev3();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/generalforms/data/GeneralFormLocalSource.java b/collect_app/src/main/java/org/fieldsight/naxa/generalforms/data/GeneralFormLocalSource.java
index 09c044c28..9a4d8d56e 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/generalforms/data/GeneralFormLocalSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/generalforms/data/GeneralFormLocalSource.java
@@ -42,7 +42,7 @@ private GeneralFormLocalSource() {
     }
 
 
-    public static GeneralFormLocalSource getInstance() {
+    public static synchronized GeneralFormLocalSource getInstance() {
         if (generalFormLocalSource == null) {
             generalFormLocalSource = new GeneralFormLocalSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/generalforms/data/GeneralFormRemoteSource.java b/collect_app/src/main/java/org/fieldsight/naxa/generalforms/data/GeneralFormRemoteSource.java
index 1102be057..163ccb494 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/generalforms/data/GeneralFormRemoteSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/generalforms/data/GeneralFormRemoteSource.java
@@ -42,7 +42,7 @@ public class GeneralFormRemoteSource implements BaseRemoteDataSource<GeneralForm
     private static GeneralFormRemoteSource generalFormRemoteSource;
     private final ProjectLocalSource projectLocalSource;
 
-    public static GeneralFormRemoteSource getInstance() {
+    public static synchronized GeneralFormRemoteSource getInstance() {
         if (generalFormRemoteSource == null) {
             generalFormRemoteSource = new GeneralFormRemoteSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/generalforms/data/GeneralFormRepository.java b/collect_app/src/main/java/org/fieldsight/naxa/generalforms/data/GeneralFormRepository.java
index e4423dd8d..a142cc6e0 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/generalforms/data/GeneralFormRepository.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/generalforms/data/GeneralFormRepository.java
@@ -16,13 +16,9 @@ public class GeneralFormRepository implements BaseRepository<GeneralForm> {
     private final GeneralFormLocalSource localSource;
     private final GeneralFormRemoteSource remoteSource;
 
-    public static GeneralFormRepository getInstance(GeneralFormLocalSource localSource, GeneralFormRemoteSource remoteSource) {
+    public static synchronized GeneralFormRepository getInstance(GeneralFormLocalSource localSource, GeneralFormRemoteSource remoteSource) {
         if (generalFormRepository == null) {
-            synchronized (GeneralFormRepository.class) {
-                if (generalFormRepository == null) {
-                    generalFormRepository = new GeneralFormRepository(localSource, remoteSource);
-                }
-            }
+            generalFormRepository = new GeneralFormRepository(localSource, remoteSource);
         }
         return generalFormRepository;
     }
@@ -54,7 +50,6 @@ public LiveData<List<GeneralForm>> getByProjectId(boolean forcedUpdate, String p
     }
 
 
-
     public LiveData<List<GeneralFormAndSubmission>> getFormsBySiteId(@NonNull String siteId, @NonNull String projectId) {
         return localSource.getFormsBySiteId(siteId, projectId);
     }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/network/ServiceGenerator.java b/collect_app/src/main/java/org/fieldsight/naxa/network/ServiceGenerator.java
index e2d77d2a5..c8f05d0dd 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/network/ServiceGenerator.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/network/ServiceGenerator.java
@@ -82,7 +82,7 @@ private static OkHttpClient createOkHttpClient(boolean cacheRequest) {
                 .build();
     }
 
-    public static <T> T createService(Class<T> serviceClass) {
+    public synchronized static <T> T createService(Class<T> serviceClass) {
         if (retrofit == null) {
             retrofit = new Retrofit.Builder()
                     .client(createOkHttpClient(false))
@@ -94,7 +94,7 @@ public static <T> T createService(Class<T> serviceClass) {
         return retrofit.create(serviceClass);
     }
 
-    public static <T> T createCacheService(Class<T> serviceClass) {
+    public synchronized static <T> T createCacheService(Class<T> serviceClass) {
         if (cacheablesRetrofit == null) {
             cacheablesRetrofit = new Retrofit.Builder()
                     .client(createOkHttpClient(true))
@@ -107,7 +107,7 @@ public static <T> T createCacheService(Class<T> serviceClass) {
         return cacheablesRetrofit.create(serviceClass);
     }
 
-    public static Retrofit getRxClient() {
+    public synchronized static Retrofit getRxClient() {
 
 
         if (okHttp == null) {
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/notificationslist/FieldSightNotificationRepository.java b/collect_app/src/main/java/org/fieldsight/naxa/notificationslist/FieldSightNotificationRepository.java
index 5e14379a7..95efd89b2 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/notificationslist/FieldSightNotificationRepository.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/notificationslist/FieldSightNotificationRepository.java
@@ -13,16 +13,12 @@ public class FieldSightNotificationRepository implements BaseRepository<FieldSig
 
 
     private final FieldSightNotificationLocalSource localSource;
-    private static FieldSightNotificationRepository fieldSightNotificationRepository ;
+    private static FieldSightNotificationRepository fieldSightNotificationRepository;
 
 
-    public static FieldSightNotificationRepository getInstance(FieldSightNotificationLocalSource localSource) {
+    public synchronized static FieldSightNotificationRepository getInstance(FieldSightNotificationLocalSource localSource) {
         if (fieldSightNotificationRepository == null) {
-            synchronized (FieldSightNotificationLocalSource.class) {
-                if (fieldSightNotificationRepository == null) {
-                    fieldSightNotificationRepository = new FieldSightNotificationRepository(localSource);
-                }
-            }
+            fieldSightNotificationRepository = new FieldSightNotificationRepository(localSource);
         }
         return fieldSightNotificationRepository;
     }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/previoussubmission/LastSubmissionLocalSource.java b/collect_app/src/main/java/org/fieldsight/naxa/previoussubmission/LastSubmissionLocalSource.java
index 549d6dbdc..7ff0cd83f 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/previoussubmission/LastSubmissionLocalSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/previoussubmission/LastSubmissionLocalSource.java
@@ -25,7 +25,7 @@ private LastSubmissionLocalSource() {
     }
 
 
-    public static LastSubmissionLocalSource getInstance() {
+    public synchronized static LastSubmissionLocalSource getInstance() {
         if (lastSubmissionLocalSource == null) {
             lastSubmissionLocalSource = new LastSubmissionLocalSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/previoussubmission/LastSubmissionRemoteSource.java b/collect_app/src/main/java/org/fieldsight/naxa/previoussubmission/LastSubmissionRemoteSource.java
index b3e46bd59..964e59580 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/previoussubmission/LastSubmissionRemoteSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/previoussubmission/LastSubmissionRemoteSource.java
@@ -32,7 +32,7 @@ public class LastSubmissionRemoteSource implements BaseRemoteDataSource<LastSubm
 
     private static LastSubmissionRemoteSource lastSubmissionRemoteSource;
 
-    public static LastSubmissionRemoteSource getInstance() {
+    public synchronized static LastSubmissionRemoteSource getInstance() {
         if (lastSubmissionRemoteSource == null) {
             lastSubmissionRemoteSource = new LastSubmissionRemoteSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/project/data/ProjectLocalSource.java b/collect_app/src/main/java/org/fieldsight/naxa/project/data/ProjectLocalSource.java
index 9920151cb..fdcc501cd 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/project/data/ProjectLocalSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/project/data/ProjectLocalSource.java
@@ -26,7 +26,7 @@ private ProjectLocalSource() {
     }
 
 
-    public static ProjectLocalSource getInstance() {
+    public static synchronized ProjectLocalSource getInstance() {
         if (projectLocalSource == null) {
             projectLocalSource = new ProjectLocalSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/project/data/ProjectRepository.java b/collect_app/src/main/java/org/fieldsight/naxa/project/data/ProjectRepository.java
index 0ec9b3973..fe92d24c5 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/project/data/ProjectRepository.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/project/data/ProjectRepository.java
@@ -1,15 +1,15 @@
 package org.fieldsight.naxa.project.data;
-import androidx.annotation.NonNull;
-import androidx.lifecycle.LiveData;
 
 import android.os.AsyncTask;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.lifecycle.LiveData;
+
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 
 import org.fieldsight.naxa.common.BaseRepository;
-import org.fieldsight.naxa.generalforms.data.GeneralFormRepository;
 import org.fieldsight.naxa.login.model.Project;
 import org.fieldsight.naxa.login.model.SiteMetaAttribute;
 import org.fieldsight.naxa.network.NetworkUtils;
@@ -47,13 +47,9 @@ public static ProjectRepository getInstance() {
         return getInstance(ProjectLocalSource.getInstance(), ProjectSitesRemoteSource.getInstance());
     }
 
-    public static ProjectRepository getInstance(ProjectLocalSource localSource, ProjectSitesRemoteSource remoteSource) {
+    public synchronized static ProjectRepository getInstance(ProjectLocalSource localSource, ProjectSitesRemoteSource remoteSource) {
         if (projectRepository == null) {
-            synchronized (GeneralFormRepository.class) {
-                if (projectRepository == null) {
-                    projectRepository = new ProjectRepository(localSource, remoteSource);
-                }
-            }
+            projectRepository = new ProjectRepository(localSource, remoteSource);
         }
         return projectRepository;
     }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/project/data/ProjectSitesRemoteSource.java b/collect_app/src/main/java/org/fieldsight/naxa/project/data/ProjectSitesRemoteSource.java
index fbeb93f6e..1d39d1edc 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/project/data/ProjectSitesRemoteSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/project/data/ProjectSitesRemoteSource.java
@@ -43,7 +43,7 @@ public class ProjectSitesRemoteSource implements BaseRemoteDataSource<MeResponse
     private final SiteRepository siteRepository;
     private final ProjectLocalSource projectLocalSource;
 
-    public static ProjectSitesRemoteSource getInstance() {
+    public synchronized static ProjectSitesRemoteSource getInstance() {
         if (projectSitesRemoteSource == null) {
             projectSitesRemoteSource = new ProjectSitesRemoteSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/scheduled/data/ScheduledFormRepository.java b/collect_app/src/main/java/org/fieldsight/naxa/scheduled/data/ScheduledFormRepository.java
index ef3966bb3..02564de5b 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/scheduled/data/ScheduledFormRepository.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/scheduled/data/ScheduledFormRepository.java
@@ -17,14 +17,9 @@ public class ScheduledFormRepository implements BaseRepository<ScheduleForm> {
     private final ScheduledFormsRemoteSource remoteSource;
 
 
-
-    public static ScheduledFormRepository getInstance(ScheduledFormsLocalSource localSource, ScheduledFormsRemoteSource remoteSource) {
+    public synchronized static ScheduledFormRepository getInstance(ScheduledFormsLocalSource localSource, ScheduledFormsRemoteSource remoteSource) {
         if (scheduledFormRepository == null) {
-            synchronized (ScheduledFormRepository.class) {
-                if (scheduledFormRepository == null) {
-                    scheduledFormRepository = new ScheduledFormRepository(localSource, remoteSource);
-                }
-            }
+            scheduledFormRepository = new ScheduledFormRepository(localSource, remoteSource);
         }
         return scheduledFormRepository;
     }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/scheduled/data/ScheduledFormsLocalSource.java b/collect_app/src/main/java/org/fieldsight/naxa/scheduled/data/ScheduledFormsLocalSource.java
index e6972c2b2..310495207 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/scheduled/data/ScheduledFormsLocalSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/scheduled/data/ScheduledFormsLocalSource.java
@@ -39,7 +39,7 @@ private ScheduledFormsLocalSource() {
         this.dao = database.getProjectScheduledFormsDAO();
     }
 
-    public static ScheduledFormsLocalSource getInstance() {
+    public synchronized static ScheduledFormsLocalSource getInstance() {
         if (scheduledFormsLocalSource == null) {
             scheduledFormsLocalSource = new ScheduledFormsLocalSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/scheduled/data/ScheduledFormsRemoteSource.java b/collect_app/src/main/java/org/fieldsight/naxa/scheduled/data/ScheduledFormsRemoteSource.java
index fbd3d2996..5c945e21e 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/scheduled/data/ScheduledFormsRemoteSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/scheduled/data/ScheduledFormsRemoteSource.java
@@ -44,7 +44,7 @@ public class ScheduledFormsRemoteSource implements BaseRemoteDataSource<Schedule
     private final SyncRepository syncRepository;
 
 
-    public static ScheduledFormsRemoteSource getInstance() {
+    public synchronized static ScheduledFormsRemoteSource getInstance() {
         if (scheduledFormsRemoteSource == null) {
             scheduledFormsRemoteSource = new ScheduledFormsRemoteSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/site/SiteTypeLocalSource.java b/collect_app/src/main/java/org/fieldsight/naxa/site/SiteTypeLocalSource.java
index 5851538cb..1c088b772 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/site/SiteTypeLocalSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/site/SiteTypeLocalSource.java
@@ -24,7 +24,7 @@ private SiteTypeLocalSource() {
     }
 
 
-    public static SiteTypeLocalSource getInstance() {
+    public synchronized static SiteTypeLocalSource getInstance() {
         if (siteTypeLocalSource == null) {
             siteTypeLocalSource = new SiteTypeLocalSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/site/SiteTypeRemoteSource.java b/collect_app/src/main/java/org/fieldsight/naxa/site/SiteTypeRemoteSource.java
index f53a4ec21..d36250b94 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/site/SiteTypeRemoteSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/site/SiteTypeRemoteSource.java
@@ -23,7 +23,7 @@ public class SiteTypeRemoteSource implements BaseRemoteDataSource<SiteType> {
 
     private static SiteTypeRemoteSource siteTypeRemoteSource;
 
-    public static SiteTypeRemoteSource getSiteTypeRemoteSource() {
+    public synchronized static SiteTypeRemoteSource getSiteTypeRemoteSource() {
         if (siteTypeRemoteSource == null) {
             siteTypeRemoteSource = new SiteTypeRemoteSource();
 
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/site/db/SiteLocalSource.java b/collect_app/src/main/java/org/fieldsight/naxa/site/db/SiteLocalSource.java
index 89e992e92..00a891a94 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/site/db/SiteLocalSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/site/db/SiteLocalSource.java
@@ -35,7 +35,7 @@ private SiteLocalSource() {
     }
 
 
-    public static SiteLocalSource getInstance() {
+    public synchronized static SiteLocalSource getInstance() {
         if (INSTANCE == null) {
             INSTANCE = new SiteLocalSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/site/db/SiteRemoteSource.java b/collect_app/src/main/java/org/fieldsight/naxa/site/db/SiteRemoteSource.java
index 2681a743e..f70f1c286 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/site/db/SiteRemoteSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/site/db/SiteRemoteSource.java
@@ -48,7 +48,7 @@ public class SiteRemoteSource implements BaseRemoteDataSource<Site> {
     private static SiteRemoteSource INSTANCE;
 
 
-    public static SiteRemoteSource getInstance() {
+    public synchronized static SiteRemoteSource getInstance() {
         if (INSTANCE == null) {
             INSTANCE = new SiteRemoteSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/site/db/SiteRepository.java b/collect_app/src/main/java/org/fieldsight/naxa/site/db/SiteRepository.java
index b5d787ecf..816ca4e23 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/site/db/SiteRepository.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/site/db/SiteRepository.java
@@ -25,14 +25,9 @@ public class SiteRepository implements BaseRepository<GeneralForm> {
     private final SiteLocalSource localSource;
 
 
-
-    public static SiteRepository getInstance(SiteLocalSource localSource) {
+    public synchronized static SiteRepository getInstance(SiteLocalSource localSource) {
         if (instance == null) {
-            synchronized (SiteRepository.class) {
-                if (instance == null) {
-                    instance = new SiteRepository(localSource);
-                }
-            }
+            instance = new SiteRepository(localSource);
         }
         return instance;
     }
@@ -43,8 +38,8 @@ private SiteRepository(@NonNull SiteLocalSource localSource) {
 
     }
 
-    public List<Site> searchSites(String searchQuery,String projectId) {
-        return localSource.searchSites(searchQuery,projectId);
+    public List<Site> searchSites(String searchQuery, String projectId) {
+        return localSource.searchSites(searchQuery, projectId);
     }
 
     public LiveData<Site> getSiteById(String id) {
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/site/db/SiteUploadHistoryLocalSource.java b/collect_app/src/main/java/org/fieldsight/naxa/site/db/SiteUploadHistoryLocalSource.java
index 5a9f5d628..f6e2a06e1 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/site/db/SiteUploadHistoryLocalSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/site/db/SiteUploadHistoryLocalSource.java
@@ -21,7 +21,7 @@ public class SiteUploadHistoryLocalSource implements BaseLocalDataSource<SiteUpl
     public static SiteUploadHistoryLocalSource siteUploadHistoryLocalSource;
     private final SiteUploadHistoryDAO dao;
 
-    public static SiteUploadHistoryLocalSource getInstance() {
+    public synchronized static SiteUploadHistoryLocalSource getInstance() {
         if (siteUploadHistoryLocalSource == null) {
             siteUploadHistoryLocalSource = new SiteUploadHistoryLocalSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/stages/StageFormRepository.java b/collect_app/src/main/java/org/fieldsight/naxa/stages/StageFormRepository.java
index f9d471e63..a1c397fd5 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/stages/StageFormRepository.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/stages/StageFormRepository.java
@@ -19,13 +19,9 @@ public class StageFormRepository implements BaseLocalDataSource<Stage> {
     private final StageLocalSource localSource;
     private final StageRemoteSource remoteSource;
 
-    public static StageFormRepository getInstance(StageLocalSource localSource, StageRemoteSource remoteSource) {
+    public synchronized static StageFormRepository getInstance(StageLocalSource localSource, StageRemoteSource remoteSource) {
         if (stageFormRepository == null) {
-            synchronized (StageFormRepository.class) {
-                if (stageFormRepository == null) {
-                    stageFormRepository = new StageFormRepository(localSource, remoteSource);
-                }
-            }
+            stageFormRepository = new StageFormRepository(localSource, remoteSource);
         }
         return stageFormRepository;
     }
@@ -58,12 +54,12 @@ public void updateAll(ArrayList<Stage> items) {
         localSource.updateAll(items);
     }
 
-    public LiveData<List<Stage>> getBySiteId(boolean forceUpdate, String siteId, String siteIdType,String projectId) {
+    public LiveData<List<Stage>> getBySiteId(boolean forceUpdate, String siteId, String siteIdType, String projectId) {
         if (forceUpdate) {
             remoteSource.getAll();
         }
 
-        return localSource.getBySiteId(siteId, siteIdType,projectId);
+        return localSource.getBySiteId(siteId, siteIdType, projectId);
     }
 
 
@@ -80,8 +76,8 @@ public Observable<List<Stage>> getByProjectIdMaybe(String projectId, String site
     }
 
 
-    public Observable<List<Stage>> getBySiteIdMaybe(String siteId, String siteIdType, String projectId){
-        return localSource.getBySiteIdMaybe(siteId,siteIdType,projectId);
+    public Observable<List<Stage>> getBySiteIdMaybe(String siteId, String siteIdType, String projectId) {
+        return localSource.getBySiteIdMaybe(siteId, siteIdType, projectId);
     }
 
 
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/stages/data/StageLocalSource.java b/collect_app/src/main/java/org/fieldsight/naxa/stages/data/StageLocalSource.java
index e383c8553..ed3805f54 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/stages/data/StageLocalSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/stages/data/StageLocalSource.java
@@ -31,7 +31,7 @@ private StageLocalSource() {
         this.dao = database.getStageDAO();
     }
 
-    public static StageLocalSource getInstance() {
+    public synchronized static StageLocalSource getInstance() {
         if (stageLocalSource == null) {
             stageLocalSource = new StageLocalSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/stages/data/StageRemoteSource.java b/collect_app/src/main/java/org/fieldsight/naxa/stages/data/StageRemoteSource.java
index c2c9458f1..2f5a1d7c4 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/stages/data/StageRemoteSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/stages/data/StageRemoteSource.java
@@ -39,7 +39,7 @@ public class StageRemoteSource implements BaseRemoteDataSource<Stage> {
     private final SyncRepository syncRepository;
 
 
-    public static StageRemoteSource getInstance() {
+    public synchronized static StageRemoteSource getInstance() {
         if (stageRemoteSource == null) {
             stageRemoteSource = new StageRemoteSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/substages/data/SubStageLocalSource.java b/collect_app/src/main/java/org/fieldsight/naxa/substages/data/SubStageLocalSource.java
index f17ce1a65..c1b9648ae 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/substages/data/SubStageLocalSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/substages/data/SubStageLocalSource.java
@@ -42,7 +42,7 @@ private SubStageLocalSource() {
         this.dao = database.getSubStageDAO();
     }
 
-    public static SubStageLocalSource getInstance() {
+    public synchronized static SubStageLocalSource getInstance() {
         if (subStageLocalSource == null) {
             subStageLocalSource = new SubStageLocalSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/substages/data/SubStageRepository.java b/collect_app/src/main/java/org/fieldsight/naxa/substages/data/SubStageRepository.java
index 1498c245a..9af1f4671 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/substages/data/SubStageRepository.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/substages/data/SubStageRepository.java
@@ -17,13 +17,9 @@ public class SubStageRepository implements BaseLocalDataSource<SubStage> {
     private static SubStageRepository subStageRepository;
     private final SubStageLocalSource localSource;
 
-    public static SubStageRepository getInstance(SubStageLocalSource localSource) {
+    public synchronized static SubStageRepository getInstance(SubStageLocalSource localSource) {
         if (subStageRepository == null) {
-            synchronized (SubStageRepository.class) {
-                if (subStageRepository == null) {
-                    subStageRepository = new SubStageRepository(localSource);
-                }
-            }
+            subStageRepository = new SubStageRepository(localSource);
         }
         return subStageRepository;
     }
@@ -36,7 +32,7 @@ private SubStageRepository(@NonNull SubStageLocalSource localSource) {
 
 
     @Override
-    public LiveData<List<SubStage>> getAll( ) {
+    public LiveData<List<SubStage>> getAll() {
         return localSource.getAll();
     }
 
@@ -56,6 +52,6 @@ public void updateAll(ArrayList<SubStage> items) {
     }
 
     public MediatorLiveData<List<SubStageAndSubmission>> getByStageId(String stageId, String siteTypeId) {
-        return localSource.getByStageId(stageId,siteTypeId);
+        return localSource.getByStageId(stageId, siteTypeId);
     }
 }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/survey/SurveyFormLocalSource.java b/collect_app/src/main/java/org/fieldsight/naxa/survey/SurveyFormLocalSource.java
index ff08921f7..0bec76634 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/survey/SurveyFormLocalSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/survey/SurveyFormLocalSource.java
@@ -22,7 +22,7 @@ private SurveyFormLocalSource() {
         this.dao = database.getSurveyDAO();
     }
 
-    public static SurveyFormLocalSource getInstance() {
+    public synchronized static SurveyFormLocalSource getInstance() {
         if (surveyFormLocalSource == null) {
             surveyFormLocalSource = new SurveyFormLocalSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/survey/SurveyFormRepository.java b/collect_app/src/main/java/org/fieldsight/naxa/survey/SurveyFormRepository.java
index e4b5bc2d4..753b445bf 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/survey/SurveyFormRepository.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/survey/SurveyFormRepository.java
@@ -3,7 +3,6 @@
 import androidx.lifecycle.LiveData;
 
 import org.fieldsight.naxa.common.BaseRepository;
-import org.fieldsight.naxa.site.db.SiteRepository;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,13 +17,9 @@ public SurveyFormRepository(SurveyFormLocalSource localSource) {
     }
 
 
-    public static SurveyFormRepository getInstance(SurveyFormLocalSource localSource) {
+    public synchronized static SurveyFormRepository getInstance(SurveyFormLocalSource localSource) {
         if (surveyFormRepository == null) {
-            synchronized (SiteRepository.class) {
-                if (surveyFormRepository == null) {
-                    surveyFormRepository = new SurveyFormRepository(localSource);
-                }
-            }
+            surveyFormRepository = new SurveyFormRepository(localSource);
         }
         return surveyFormRepository;
     }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/sync/DownloadableItemLocalSource.java b/collect_app/src/main/java/org/fieldsight/naxa/sync/DownloadableItemLocalSource.java
index cfc7ae3e7..30879a229 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/sync/DownloadableItemLocalSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/sync/DownloadableItemLocalSource.java
@@ -31,7 +31,7 @@ public class DownloadableItemLocalSource implements BaseLocalDataSourceRX<Downlo
     private static DownloadableItemLocalSource downloadableItemLocalSource;
     private final DownloadableItemDAO syncDAO;
 
-    public static DownloadableItemLocalSource getDownloadableItemLocalSource() {
+    public synchronized static DownloadableItemLocalSource getDownloadableItemLocalSource() {
         if (downloadableItemLocalSource == null) {
             downloadableItemLocalSource = new DownloadableItemLocalSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/sync/SyncRepository.java b/collect_app/src/main/java/org/fieldsight/naxa/sync/SyncRepository.java
index 355436081..791cd3d15 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/sync/SyncRepository.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/sync/SyncRepository.java
@@ -41,14 +41,9 @@ public SyncRepository(Application application) {
         init();
     }
 
-    public static SyncRepository getInstance() {
+    public synchronized static SyncRepository getInstance() {
         if (instance == null) {
-            synchronized (SyncRepository.class) {
-                if (instance == null) {
-                    instance = new SyncRepository(Collect.getInstance());
-                }
-            }
-
+            instance = new SyncRepository(Collect.getInstance());
         }
 
         return instance;
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/v3/network/NotificationRemoteSource.java b/collect_app/src/main/java/org/fieldsight/naxa/v3/network/NotificationRemoteSource.java
index 80a56d02c..83ba6cda7 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/v3/network/NotificationRemoteSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/v3/network/NotificationRemoteSource.java
@@ -13,7 +13,7 @@ public class NotificationRemoteSource {
 
     private static NotificationRemoteSource notificationRemoteSource;
 
-    public static NotificationRemoteSource getInstance() {
+    public synchronized static NotificationRemoteSource getInstance() {
         if (notificationRemoteSource == null) {
             notificationRemoteSource = new NotificationRemoteSource();
         }
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/v3/network/ProjectRemoteSource.java b/collect_app/src/main/java/org/fieldsight/naxa/v3/network/ProjectRemoteSource.java
index ea7a589e3..968db757e 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/v3/network/ProjectRemoteSource.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/v3/network/ProjectRemoteSource.java
@@ -8,13 +8,13 @@
 
 public class ProjectRemoteSource {
 
-    private static ProjectRemoteSource INSTANCE;
+    private static ProjectRemoteSource projectRemoteSource;
 
-    public static ProjectRemoteSource getInstance() {
-        if (INSTANCE == null) {
-            INSTANCE = new ProjectRemoteSource();
+    public synchronized static ProjectRemoteSource getInstance() {
+        if (projectRemoteSource == null) {
+            projectRemoteSource = new ProjectRemoteSource();
         }
-        return INSTANCE;
+        return projectRemoteSource;
     }
 
     public Single<ResponseBody> getProjects() {
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/v3/network/SyncLocalSource3.java b/collect_app/src/main/java/org/fieldsight/naxa/v3/network/SyncLocalSource3.java
index 3bdb5c3ae..08a7fad50 100644
--- a/collect_app/src/main/java/org/fieldsight/naxa/v3/network/SyncLocalSource3.java
+++ b/collect_app/src/main/java/org/fieldsight/naxa/v3/network/SyncLocalSource3.java
@@ -27,7 +27,7 @@ private SyncLocalSource3() {
     }
 
 
-    public static SyncLocalSource3 getInstance() {
+    public synchronized static SyncLocalSource3 getInstance() {
         if (syncLocalSource3 == null) {
             syncLocalSource3 = new SyncLocalSource3();
         }
diff --git a/config/pmd-ruleset.xml b/config/pmd-ruleset.xml
index 96cd8927d..877657381 100644
--- a/config/pmd-ruleset.xml
+++ b/config/pmd-ruleset.xml
@@ -83,12 +83,12 @@
         <exclude name="UseObjectForClearerAPI" />
     </rule>
 
-<!--    <rule ref="category/java/documentation.xml">-->
-<!--        <exclude name="CommentSize" />-->
-<!--        <exclude name="CommentRequired" />-->
-<!--        <exclude name="UncommentedEmptyConstructor" />-->
-<!--        <exclude name="UncommentedEmptyMethodBody" />-->
-<!--    </rule>-->
+    <rule ref="category/java/documentation.xml">
+        <exclude name="CommentSize" />
+        <exclude name="CommentRequired" />
+        <exclude name="UncommentedEmptyConstructor" />
+        <exclude name="UncommentedEmptyMethodBody" />
+    </rule>
 
     <rule ref="category/java/errorprone.xml">
         <exclude name="AssignmentInOperand" />
@@ -118,11 +118,11 @@
         <exclude name="NonStaticInitializer" />
     </rule>
 
-<!--    <rule ref="category/java/multithreading.xml">-->
-<!--        <exclude name="AvoidSynchronizedAtMethodLevel" />-->
-<!--        <exclude name="DoNotUseThreads" />-->
-<!--        <exclude name="UseConcurrentHashMap" />-->
-<!--    </rule>-->
+    <rule ref="category/java/multithreading.xml">
+        <exclude name="AvoidSynchronizedAtMethodLevel" />
+        <exclude name="DoNotUseThreads" />
+        <exclude name="UseConcurrentHashMap" />
+    </rule>
 
     <rule ref="category/java/performance.xml">
         <exclude name="AvoidFileStream" />