diff --git a/concordia/CMakeLists.txt b/concordia/CMakeLists.txt
index e054bce..15b6089 100644
--- a/concordia/CMakeLists.txt
+++ b/concordia/CMakeLists.txt
@@ -6,6 +6,7 @@ foreach(dir ${ALL_DIRECTORIES})
 endforeach(dir)
 
 add_library(concordia SHARED
+  anubis_searcher.cpp
   regex_replacement.cpp
   sentence_anonymizer.cpp
   interval.cpp
@@ -30,6 +31,7 @@ add_subdirectory(t)
 
 install(TARGETS concordia DESTINATION lib/)
 install(FILES 
+          anubis_searcher.hpp
           regex_replacement.hpp
           sentence_anonymizer.hpp
           interval.hpp
diff --git a/concordia/anubis_searcher.cpp b/concordia/anubis_searcher.cpp
new file mode 100644
index 0000000..94481ee
--- /dev/null
+++ b/concordia/anubis_searcher.cpp
@@ -0,0 +1,21 @@
+#include "concordia/anubis_searcher.hpp"
+
+
+AnubisSearcher::AnubisSearcher() {
+}
+
+
+AnubisSearcher::~AnubisSearcher() {
+}
+
+
+boost::ptr_vector<AnubisSearchResult> AnubisSearcher::anubisSearch(
+                boost::shared_ptr<std::vector<sauchar_t> > T,
+                boost::shared_ptr<std::vector<SUFFIX_MARKER_TYPE> > markers,
+                boost::shared_ptr<std::vector<saidx_t> > SA,
+                boost::shared_ptr<std::vector<INDEX_CHARACTER_TYPE> >) 
+                                                throw(ConcordiaException) {
+
+    boost::ptr_vector<AnubisSearchResult> result;
+    return result;
+}
diff --git a/concordia/anubis_searcher.hpp b/concordia/anubis_searcher.hpp
new file mode 100644
index 0000000..cc4fc4c
--- /dev/null
+++ b/concordia/anubis_searcher.hpp
@@ -0,0 +1,37 @@
+#ifndef ANUBIS_SEARCHER_HDR
+#define ANUBIS_SEARCHER_HDR
+
+#include <boost/shared_ptr.hpp>
+#include <boost/ptr_container/ptr_vector.hpp>
+
+#include "concordia/common/config.hpp"
+#include "concordia/substring_occurence.hpp"
+#include "concordia/concordia_exception.hpp"
+#include "concordia/anubis_search_result.hpp"
+
+#include <divsufsort.h>
+
+/*!
+  Class for searching using Anubis algorithm.
+
+*/
+
+using namespace std;
+
+class AnubisSearcher {
+public:
+    explicit AnubisSearcher();
+
+    /*! Destructor.
+    */
+    virtual ~AnubisSearcher();
+
+    boost::ptr_vector<AnubisSearchResult> anubisSearch(
+                    boost::shared_ptr<std::vector<sauchar_t> > T,
+                    boost::shared_ptr<std::vector<SUFFIX_MARKER_TYPE> > markers,
+                    boost::shared_ptr<std::vector<saidx_t> > SA,
+                    boost::shared_ptr<std::vector<INDEX_CHARACTER_TYPE> >) throw(ConcordiaException);
+private:
+};
+
+#endif
diff --git a/concordia/index_searcher.cpp b/concordia/index_searcher.cpp
index fe9bdd4..3c0df60 100644
--- a/concordia/index_searcher.cpp
+++ b/concordia/index_searcher.cpp
@@ -4,6 +4,8 @@
 #include <boost/filesystem.hpp>
 
 IndexSearcher::IndexSearcher() {
+    _anubisSearcher = boost::shared_ptr<AnubisSearcher>(
+                                   new AnubisSearcher());
 }
 
 
@@ -25,7 +27,7 @@ boost::ptr_vector<SubstringOccurence> IndexSearcher::simpleSearch(
     sauchar_t * patternArray = Utils::indexVectorToSaucharArray(hash);
     int size = sa_search(T->data(), (saidx_t) T->size(),
                          (const sauchar_t *) patternArray, patternLength,
-                         SA->data(), (saidx_t) T->size(), &left);
+                         SA->data(), (saidx_t) SA->size(), &left);
     for (int i = 0; i < size; ++i) {
         saidx_t resultPos = SA->at(left + i);
         if (resultPos % sizeof(INDEX_CHARACTER_TYPE) == 0) {
@@ -55,6 +57,7 @@ boost::ptr_vector<AnubisSearchResult> IndexSearcher::anubisSearch(
                   boost::shared_ptr<std::vector<SUFFIX_MARKER_TYPE> > markers,
                   boost::shared_ptr<std::vector<saidx_t> > SA,
                   const string & pattern) throw(ConcordiaException) {
-    boost::ptr_vector<AnubisSearchResult> result;
-    return result;
+    boost::shared_ptr<vector<INDEX_CHARACTER_TYPE> > hash =
+                                          hashGenerator->generateHash(pattern);
+    return _anubisSearcher->anubisSearch(T, markers, SA, hash);
 }
diff --git a/concordia/index_searcher.hpp b/concordia/index_searcher.hpp
index 3b59d68..b8813a1 100644
--- a/concordia/index_searcher.hpp
+++ b/concordia/index_searcher.hpp
@@ -10,6 +10,7 @@
 #include "concordia/substring_occurence.hpp"
 #include "concordia/hash_generator.hpp"
 #include "concordia/concordia_exception.hpp"
+#include "concordia/anubis_searcher.hpp"
 #include "concordia/anubis_search_result.hpp"
 
 #include <divsufsort.h>
@@ -43,6 +44,7 @@ public:
                     boost::shared_ptr<std::vector<saidx_t> > SA,
                     const string & pattern) throw(ConcordiaException);
 private:
+    boost::shared_ptr<AnubisSearcher> _anubisSearcher;
 };
 
 #endif