diff --git a/similarity_search/src/space/space_bit_hamming.cc b/similarity_search/src/space/space_bit_hamming.cc
index 84aad92..5216c40 100644
--- a/similarity_search/src/space/space_bit_hamming.cc
+++ b/similarity_search/src/space/space_bit_hamming.cc
@@ -24,6 +24,7 @@
 #include "permutation_utils.h"
 #include "logging.h"
 #include "distcomp.h"
+#include "read_data.h"
 #include "experimentconf.h"
 
 namespace similarity {
@@ -51,13 +52,15 @@ void SpaceBitHamming::ReadBitMaskVect(std::string line, LabelType& label, std::v
 
   str.exceptions(std::ios::badbit);
 
-  unsigned val;
 
   ReplaceSomePunct(line); 
 
   vector<PivotIdType> v;
 
+#if 0
   try {
+    unsigned val;
+
     while (str >> val) {
       if (val != 0 && val != 1) {
         throw runtime_error("Only zeros and ones are allowed");
@@ -70,6 +73,20 @@ void SpaceBitHamming::ReadBitMaskVect(std::string line, LabelType& label, std::v
     LOG(LIB_ERROR) << err.stream().str();
     THROW_RUNTIME_ERR(err);
   }
+#else
+  if (!ReadVecDataEfficiently(line, v)) {
+    PREPARE_RUNTIME_ERR(err) << "Failed to parse the line: '" << line << "'";
+    LOG(LIB_ERROR) << err.stream().str();
+    THROW_RUNTIME_ERR(err);
+  }
+  for (auto val : v) {
+    if (val != 0 && val != 1) {
+      PREPARE_RUNTIME_ERR(err) << "Only zeros and ones are allowed, offending line: '" << line << "'";
+      LOG(LIB_ERROR) << err.stream().str();
+      THROW_RUNTIME_ERR(err);
+    }
+  }
+#endif
   Binarize(v, 1, binVect);      // Create the binary vector
   binVect.push_back(v.size());   // Put the number of elements in the end
 }
diff --git a/similarity_search/src/space/space_sparse_jaccard.cc b/similarity_search/src/space/space_sparse_jaccard.cc
index 56508ee..e0059bf 100644
--- a/similarity_search/src/space/space_sparse_jaccard.cc
+++ b/similarity_search/src/space/space_sparse_jaccard.cc
@@ -28,6 +28,7 @@
 #include "logging.h"
 #include "distcomp.h"
 #include "experimentconf.h"
+#include "read_data.h"
 #include "space/space_sparse_jaccard.h"
 
 namespace similarity {
@@ -40,6 +41,7 @@ static void ReadIdList(string line, LabelType& label, vector<IdType>& v)
 
   label = Object::extractLabel(line);
 
+#if 0
   ReplaceSomePunct(line); 
   stringstream str(line);
 
@@ -56,6 +58,13 @@ static void ReadIdList(string line, LabelType& label, vector<IdType>& v)
     LOG(LIB_ERROR) << "Exception: " << e.what();
     LOG(LIB_FATAL) << "Failed to parse the line: '" << line << "'";
   }
+#else
+  if (!ReadVecDataEfficiently(line, v)) {
+    PREPARE_RUNTIME_ERR(err) << "Failed to parse the line: '" << line << "'";
+    LOG(LIB_ERROR) << err.stream().str();
+    THROW_RUNTIME_ERR(err);
+  }
+#endif
 
   sort(v.begin(), v.end());
 }