diff --git a/Gemfile.lock b/Gemfile.lock
index a18803f..4646394 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/mezuro/kalibro_client
-  revision: cd1f8d931432a7257d0fe1abcacdaf50b8fd3976
+  revision: 1a4ef5f0ea168a6d91d1e86866f906ffccf59cad
   specs:
     kalibro_client (0.0.1)
       activeresource (~> 4.0.0)
diff --git a/app/models/date_module_result.rb b/app/models/date_module_result.rb
index e110de8..7bb8f8f 100644
--- a/app/models/date_module_result.rb
+++ b/app/models/date_module_result.rb
@@ -1,7 +1,2 @@
-class DateModuleResult < KalibroGatekeeperClient::Entities::DateModuleResult
-  include KalibroRecord
-
-  def module_result
-    ModuleResult.new @module_result.to_hash
-  end
-end
\ No newline at end of file
+class DateModuleResult < KalibroClient::Miscellaneous::DateModuleResult
+end
diff --git a/app/models/module_result.rb b/app/models/module_result.rb
index 4b6d153..e887c9a 100644
--- a/app/models/module_result.rb
+++ b/app/models/module_result.rb
@@ -1,15 +1,7 @@
-class ModuleResult < KalibroGatekeeperClient::Entities::ModuleResult
-  include KalibroRecord
-
-  def metric_results
-    KalibroGatekeeperClient::Entities::MetricResult.metric_results_of(@id)
-  end
-
-  def history
-    self.class.history_of(@id).map { |date_module_result| DateModuleResult.new date_module_result.to_hash }
-  end
+class ModuleResult < KalibroClient::Processor::ModuleResult
 
   def metric_history(name)
+    history = self.processing.repository.module_result_history_of(self)
     grade_history = Hash.new
 
     history.each { |date_module_result| grade_history[date_module_result.date] =
diff --git a/spec/factories/date_module_results.rb b/spec/factories/date_module_results.rb
index 04bd141..f477003 100644
--- a/spec/factories/date_module_results.rb
+++ b/spec/factories/date_module_results.rb
@@ -2,5 +2,7 @@ FactoryGirl.define do
   factory :date_module_result, class: DateModuleResult do
     date "2011-10-20T18:26:43.151+00:00"
     module_result {FactoryGirl.build(:module_result)}
+
+    initialize_with { new({:date => date, :module_result => module_result}) }
   end
-end
\ No newline at end of file
+end
diff --git a/spec/factories/module_results.rb b/spec/factories/module_results.rb
index b1bcdc6..562e02b 100644
--- a/spec/factories/module_results.rb
+++ b/spec/factories/module_results.rb
@@ -1,17 +1,17 @@
 FactoryGirl.define do
   factory :module_result, class: ModuleResult do
-    id "42"
+    id 42
     self.module { FactoryGirl.build(:module) }
-    grade "10.0"
-    parent_id "21"
-    height "6"
+    grade 10.0
+    parent_id 21
+    height 6
   end
 
   factory :root_module_result, class: ModuleResult do
-    id "21"
+    id 21
     self.module { FactoryGirl.build(:module) }
-    grade "6.0"
+    grade 6.0
     parent_id nil
-    height "1"
+    height 1
   end
-end
\ No newline at end of file
+end
diff --git a/spec/models/module_result_spec.rb b/spec/models/module_result_spec.rb
index 92e99a9..35aec80 100644
--- a/spec/models/module_result_spec.rb
+++ b/spec/models/module_result_spec.rb
@@ -4,30 +4,16 @@ describe ModuleResult, :type => :model do
   describe 'methods' do
     subject { FactoryGirl.build(:module_result) }
     
-    describe 'metric_results' do
-      it 'should call the metric_results_of method' do
-        KalibroGatekeeperClient::Entities::MetricResult.expects(:metric_results_of).with(subject.id).returns(nil)
-
-        subject.metric_results
-      end
-    end
-
-    describe 'history' do
-      before :each do
-        ModuleResult.expects(:history_of).with(subject.id).returns([FactoryGirl.build(:date_module_result)])
-      end
-
-      it 'should return a array of DateModuleResults' do
-        expect(subject.history.first).to be_a(DateModuleResult)
-      end
-    end
-
     describe 'metric_history' do
       let(:date_module_result) {FactoryGirl.build(:date_module_result)}
       let(:metric_result) {FactoryGirl.build(:metric_result)}
+      let(:processing) {FactoryGirl.build(:processing)}
+      let(:repository) {FactoryGirl.build(:repository)}
 
       before :each do
-        subject.expects(:history).returns([date_module_result])
+        subject.expects(:processing).returns(processing)
+        processing.expects(:repository).returns(repository)
+        repository.expects(:module_result_history_of).with(subject).returns([date_module_result])
         ModuleResult.any_instance.expects(:metric_results).returns([metric_result])
       end
 
@@ -36,4 +22,4 @@ describe ModuleResult, :type => :model do
       end
     end
   end
-end
\ No newline at end of file
+end
--
libgit2 0.21.2