diff --git a/app/repositories/orient_db/base.rb b/app/repositories/orient_db/base.rb
index 792381900e6f57a06c70f241d1a620c6f0f2de7a..2acfcab6f5745cf05865f9dd81b20e1388cdcc35 100644
--- a/app/repositories/orient_db/base.rb
+++ b/app/repositories/orient_db/base.rb
@@ -1,5 +1,5 @@
 class OrientDb::Base
-  include OrientDb::Methods::GenericMethods
+  include OrientDb::Methods::FinderMethods
 
   def initialize(orientdb_connection)
     @connection = orientdb_connection
@@ -14,7 +14,6 @@ class OrientDb::Base
     build_object result
   end
 
-
   def all
     objects_hash = connection.query "SELECT FROM #{odb_class}", :limit => -1
     objects = build_objects(objects_hash) || []
@@ -47,11 +46,10 @@ class OrientDb::Base
   end
 
   def build_hash(object)
-    hash = {}
-    hash["@class"] = odb_class
+    hash = {'@class' => odb_class}
     object.instance_variables.each do |var|
       var_name = sanitize_orientdb_vars(var)
-      hash[var_name] = object.instance_variable_get(var)
+      hash[var_name] = sanitize_orientdb_values(object.instance_variable_get(var))
     end
     hash
   end
@@ -60,6 +58,10 @@ class OrientDb::Base
     var.to_s.gsub(/\A@/, "")
   end
 
+  def sanitize_orientdb_values(val)
+    val
+  end
+
   def build_object(args={})
     raise NoMethodError, "You must implement this method"
   end