diff --git a/plugins/mezuro/controllers/profile/mezuro_plugin_module_controller.rb b/plugins/mezuro/controllers/profile/mezuro_plugin_module_controller.rb
index fca34db..1f35c9c 100644
--- a/plugins/mezuro/controllers/profile/mezuro_plugin_module_controller.rb
+++ b/plugins/mezuro/controllers/profile/mezuro_plugin_module_controller.rb
@@ -3,10 +3,10 @@ class MezuroPluginModuleController < MezuroPluginProfileController
   append_view_path File.join(File.dirname(__FILE__) + '/../../views')
 
   def module_result
-    @content = profile.articles.find(params[:id])
-    @module_result = @content.module_result(params)
-    @module = @module_result.module
-    @module_label = "#{@module.name} (#{@module.granularity})"
+    project_content = profile.articles.find(params[:id])
+    repositories = project_content.repositories
+    @module_result = project_content.module_result(repositories.first.id)
+    @metric_results = Kalibro::MetricResult.metric_results_of(@module_result.id)
     if project_content_has_errors?
       redirect_to_error_page(@content.errors[:base])
     else
@@ -15,9 +15,9 @@ class MezuroPluginModuleController < MezuroPluginProfileController
   end
  
   def module_metrics_history
-    metric_name = params[:metric_name]
+    module_result_id = params[:module_result_id]
     @content = profile.articles.find(params[:id])
-    module_history = @content.result_history(params[:module_name])
+    module_history = @content.result_history(params[:module_result_id])
     if project_content_has_errors?
       redirect_to_error_page(@content.errors[:base])
     else
@@ -28,7 +28,7 @@ class MezuroPluginModuleController < MezuroPluginProfileController
 
   def module_grade_history
     @content = profile.articles.find(params[:id])
-    modules_results = @content.result_history(params[:module_name])
+    modules_results = @content.result_history(params[:module_result_id])
     if project_content_has_errors?
       redirect_to_error_page(@content.errors[:base])
     else
@@ -42,16 +42,12 @@ class MezuroPluginModuleController < MezuroPluginProfileController
   private
 
   def filtering_metric_history(metric_name, module_history)
-    metrics_history = module_history.map do |module_result|
-      [module_result.metric_results, format_date_to_simple_form(module_result.date)]
-    end
-    metric_history =  metrics_history.map do |metric_results_with_date|
-      [(metric_results_with_date.first.select do |metric_result|
-        metric_result.metric.name.delete("() ") == metric_name
-      end).first, metric_results_with_date.last]
+    metrics_history = module_history.select do |m|
+      m.metric_result.configuration.metric.name.delete("() ") == metric_name
     end
-    metric_history.map do |metric_result_with_date|
-      [metric_result_with_date.first.value, metric_result_with_date.last]
+    
+    metric_history = metrics_history.map do |m|
+      [m.metric_result.value, format_date_to_simple_form(m.date)]
     end
   end
 
diff --git a/plugins/mezuro/lib/kalibro/metric_configuration_snapshot.rb b/plugins/mezuro/lib/kalibro/metric_configuration_snapshot.rb
index c7aa7dc..56b475c 100644
--- a/plugins/mezuro/lib/kalibro/metric_configuration_snapshot.rb
+++ b/plugins/mezuro/lib/kalibro/metric_configuration_snapshot.rb
@@ -11,7 +11,11 @@ class Kalibro::MetricConfigurationSnapshot < Kalibro::Model
   end
 
   def range=(value)
-    @range = Kalibro::Range.to_object value
+    @range = Kalibro::RangeSnapshot.to_object value
+  end
+
+  def range_snapshot
+    range
   end
 
 end
diff --git a/plugins/mezuro/lib/kalibro/metric_result.rb b/plugins/mezuro/lib/kalibro/metric_result.rb
index 55e41d8..da40f70 100644
--- a/plugins/mezuro/lib/kalibro/metric_result.rb
+++ b/plugins/mezuro/lib/kalibro/metric_result.rb
@@ -10,6 +10,10 @@ class Kalibro::MetricResult < Kalibro::Model
     @configuration = Kalibro::MetricConfigurationSnapshot.to_object value
   end
 
+  def metric_configuration_snapshot
+    configuration
+  end
+
   def error=(value)
     @error = Kalibro::Throwable.to_object value
   end
diff --git a/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb b/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
index dcfdbc6..c828423 100644
--- a/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
+++ b/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
@@ -45,8 +45,8 @@ class MezuroPlugin::Helpers::ContentViewerHelper
     selected_option.first
   end
 
-  def self.format_name(metric_result)
-    metric_result.configuration.metric.name.delete("() ")
+  def self.format_name(metric_configuration_snapshot)
+    metric_configuration_snapshot.metric.name.delete("() ")
   end
 
   def self.get_license_option(selected)
diff --git a/plugins/mezuro/public/javascripts/project_content.js b/plugins/mezuro/public/javascripts/project_content.js
index 2a5a79a..a889498 100644
--- a/plugins/mezuro/public/javascripts/project_content.js
+++ b/plugins/mezuro/public/javascripts/project_content.js
@@ -18,7 +18,7 @@ function display_metric_history() {
   var metric_name = jQuery(this).attr('show-metric-history');
   toggle_mezuro("." + metric_name);
   metricName = metric_name;
-  callAction('module', 'module_metrics_history', {module_name: module_name, metric_name: metric_name}, show_metrics);
+  callAction('module', 'module_metrics_history', {module_id: module_id, module_result_id: module_result_id}, show_metrics);
   return false;
 }
 
diff --git a/plugins/mezuro/views/mezuro_plugin_module/_module_result.rhtml b/plugins/mezuro/views/mezuro_plugin_module/_module_result.rhtml
index c07f944..790779b 100644
--- a/plugins/mezuro/views/mezuro_plugin_module/_module_result.rhtml
+++ b/plugins/mezuro/views/mezuro_plugin_module/_module_result.rhtml
@@ -1,4 +1,5 @@
-<h5><%= _('Metric results for: ') + @module_label %> </h5>
+<% module_name = @module_result.module.name
+<h5><%= _('Metric results for: #{module_name} (#{@module_result.module.granularity}) ') %> </h5>
 
 <hr/>
 <div class="zoomable-image">
@@ -12,26 +13,28 @@
     </tr>
   </thead>
   <tbody>
-    <% @module_result.metric_results.each do |metric_result|  %>
-      <% range = metric_result.range %>
-      <% if !range.nil? %>
+    <% @metric_results.each do |metric_result|  %>
+      <% metric_configuration_snapshot = metric_result.metric_configuration_snapshot%>
+      <% range_snapshot = metric_configuration_snapshot.range_snapshot %>
+      <% formatted_name = MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_configuration_snapshot) %>
+      <% if !range_snapshot.nil? %>
         <tr>
-          <td style="width: 74%"><a href="#" show-metric-history="<%= MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_result) %>" data-module-name="<%= @module.name %>"><%= metric_result.metric.name %></a></td>
+          <td style="width: 74%"><a href="#" show-metric-history="<%= formatted_name %>" data-module-name="<%= module_name %>"><%= metric_configuration_snapshot.metric.name %></a></td>
           <td><%= MezuroPlugin::Helpers::ContentViewerHelper.format_grade(metric_result.value) %></td>
-          <td><%= metric_result.weight %></td>
-          <td style="background-color: #<%= range.color[2..-1] %>">
-            <span title="<%= range.comments %>" >
-              <%= range.label %>
+          <td><%= metric_configuration_snapshot.weight %></td>
+          <td style="background-color: #<%= range_snapshot.color %>">
+            <span title="<%= range_snapshot.comments %>" >
+              <%= range_snapshot.label %>
             </span>
           </td>
         </tr>	  
-        <tr class="<%= MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_result) %>" style="display: none;">
+        <tr class="<%= formatted_name %>" style="display: none;">
           <td colspan="3">
-            <div id='historical-<%= MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_result) %>'>
+            <div id='historical-<%= formatted_name %>'>
             </div>
           </td>
           <td align="right">
-            <%= range.comments.nil? ? '' : range.comments %>
+            <%= range_snapshot.comments.nil? ? '' : range_snapshot.comments %>
           </td> 
         </tr>
       <% end %>
@@ -43,7 +46,7 @@
         <div id='historical-grade' style="display: none;"></div>
       </td>
       <td align = "right">
-        <a href="#" show-grade-history="<%= @module_result.module.name %>" data-module-name="<%= @module.name%>" >
+        <a href="#" show-grade-history="<%= module_name %>" data-module-name="<%= module_name%>" >
           <strong>
             <%= _('Grade:') %>
             <%= "%.02f" % @module_result.grade %>
--
libgit2 0.21.2