diff --git a/app/models/learning_object.rb b/app/models/learning_object.rb
index 8975b7a6a02c2035438e58e385fc45618d58c8aa..ce83d7e9770b09e03592cff2c49943ad776281e1 100644
--- a/app/models/learning_object.rb
+++ b/app/models/learning_object.rb
@@ -6,7 +6,7 @@ class LearningObject
   attr_accessor :id, :id_dspace, :rid, :name, :author, :description,
                 :published_at, :thumbnail, :created_at, :last_modified,
                 :type, :grade_level, :attachment, :metadata, :score,
-
+                :main_bitstream_id
                 # Relation attrs
                 :likes, :views, :downloads, :subjects, :attributes, :publisher
 
diff --git a/lib/orient_db/migrations/create_collection.rb b/lib/orient_db/migrations/create_collection.rb
index e421abef16ff42263b597ac01404a3fc66e288ea..545fca8708ae4c72299d88b09f5cedd5b87d2291 100644
--- a/lib/orient_db/migrations/create_collection.rb
+++ b/lib/orient_db/migrations/create_collection.rb
@@ -6,6 +6,8 @@ class OrientDb::Migrations::CreateCollection < OrientDb::Migration
         c.property 'description', :string
         c.link     'learning_objects',  :linkset, 'LearningObject'
     end
+    metadata = {:analyzer => "org.apache.lucene.analysis.br.BrazilianAnalyzer"}
+    add_index 'Collection', ['name', 'description'], "FULLTEXT", "collection_search", "LUCENE", metadata.to_json
   end
 
   def down
diff --git a/lib/orient_db/migrations/create_learning_object.rb b/lib/orient_db/migrations/create_learning_object.rb
index ee70dddab45e558f53f5a049a142bc79ae967880..69fc736890ca84499c35f8c7f4a96757ab5398a8 100644
--- a/lib/orient_db/migrations/create_learning_object.rb
+++ b/lib/orient_db/migrations/create_learning_object.rb
@@ -2,7 +2,8 @@ class OrientDb::Migrations::CreateLearningObject < OrientDb::Migration
 
   def up
     create_class 'LearningObject', 'Object' do |c|
-        c.property 'id_dspace', :integer, :mandatory => true, :notnull => true
+        c.property 'id_dspace', :long, :mandatory => true, :notnull => true
+        c.property 'main_bitstream_id', :long
         c.property 'description', :string
         c.property 'thumbnail', :string
         c.property 'type', :string
@@ -15,7 +16,7 @@ class OrientDb::Migrations::CreateLearningObject < OrientDb::Migration
     end
     add_index 'LearningObject', ['id_dspace'], "UNIQUE_HASH_INDEX"
     metadata = {:analyzer => "org.apache.lucene.analysis.br.BrazilianAnalyzer"}
-    add_index 'LearningObject', ['name', 'description'], "FULLTEXT", "learningobject_search", "LUCENE", metadata.to_json
+    add_index 'LearningObject', ['name', 'description', 'author'], "FULLTEXT", "learningobject_search", "LUCENE", metadata.to_json
   end
 
   def down