diff --git a/app/controllers/metric_configurations_controller.rb b/app/controllers/metric_configurations_controller.rb
index 8f1c3e4..6147b15 100644
--- a/app/controllers/metric_configurations_controller.rb
+++ b/app/controllers/metric_configurations_controller.rb
@@ -10,19 +10,17 @@ class MetricConfigurationsController < ApplicationController
   end
 
   def new
-    @base_tool_name = params[:base_tool_name]
-    @metric = KalibroGem::Entities::BaseTool.find_by_name(params[:base_tool_name]).metric params[:metric_name]
-    @mezuro_configuration_id = params[:mezuro_configuration_id].to_i
     @metric_configuration = MetricConfiguration.new
+    @metric_configuration.configuration_id = params[:mezuro_configuration_id].to_i
+    @metric_configuration.base_tool_name = params[:base_tool_name]
+    @metric_configuration.metric = KalibroGem::Entities::BaseTool.find_by_name(params[:base_tool_name]).metric params[:metric_name]
   end
 
   def create
     @metric_configuration = MetricConfiguration.new(metric_configuration_params)
-    @base_tool_name = params[:base_tool_name]
-    @metric = KalibroGem::Entities::BaseTool.find_by_name(params[:base_tool_name]).metric(params[:metric_name])
     @metric_configuration.configuration_id = params[:mezuro_configuration_id].to_i
-    @metric_configuration.metric = @metric
-    @metric_configuration.base_tool_name = @base_tool_name
+    @metric_configuration.metric = KalibroGem::Entities::BaseTool.find_by_name(params[:base_tool_name]).metric params[:metric_name]
+    @metric_configuration.base_tool_name = params[:base_tool_name]
     respond_to do |format|
       create_and_redir(format)
     end
diff --git a/app/views/metric_configurations/_form.html.erb b/app/views/metric_configurations/_form.html.erb
index ee87701..ef8e461 100644
--- a/app/views/metric_configurations/_form.html.erb
+++ b/app/views/metric_configurations/_form.html.erb
@@ -20,9 +20,9 @@
   <%= f.select( :reading_group_id, reading_group_options, {class: 'form-control'} ) %>
 </div>
 
-<%= hidden_field_tag(:metric_name, @metric.name) %>
-<%= hidden_field_tag(:base_tool_name, @base_tool_name) %>
+<%= hidden_field_tag(:metric_name, @metric_configuration.metric.name) %>
+<%= hidden_field_tag(:base_tool_name, @metric_configuration.base_tool_name) %>
 
 <br>
 <%= f.submit 'Save', class: 'btn btn-primary' %>
-<%= link_to 'Back',  mezuro_configuration_path(@mezuro_configuration_id), class: 'btn btn-default' %>
+<%= link_to 'Back',  mezuro_configuration_path(@metric_configuration.configuration_id), class: 'btn btn-default' %>
diff --git a/app/views/metric_configurations/new.html.erb b/app/views/metric_configurations/new.html.erb
index 614c028..a6feb47 100644
--- a/app/views/metric_configurations/new.html.erb
+++ b/app/views/metric_configurations/new.html.erb
@@ -3,24 +3,24 @@
 </div>
 
 <p>
-  <b>Base Tool:</b> <%= @base_tool_name %>
+  <b>Base Tool:</b> <%= @metric_configuration.base_tool_name %>
 </p>
 <p>
-  <b>Metric Name:</b> <%= @metric.name %>
+  <b>Metric Name:</b> <%= @metric_configuration.metric.name %>
 </p>
 <p>
-  <b>Metric Description:</b> <%= @metric.description.nil? ? "No description available." : @metric.description %>
+  <b>Metric Description:</b> <%= @metric_configuration.metric.description.nil? ? "No description available." : @metric.description %>
 </p>
 <p>
-  <b>Language:</b> <%= @metric.languages.to_s %>
+  <b>Language:</b> <%= @metric_configuration.metric.languages.to_s %>
 </p>
 
 <p>
-  <b>Scope:</b> <%= @metric.scope %>
+  <b>Scope:</b> <%= @metric_configuration.metric.scope %>
 </p>
 
 <br>
 
-<%= form_for(@metric_configuration, :url => mezuro_configuration_metric_configurations_path(@mezuro_configuration_id)) do |f| %>
+<%= form_for(@metric_configuration, :url => mezuro_configuration_metric_configurations_path(@metric_configuration.configuration_id)) do |f| %>
   <%= render partial: 'form', locals: {f: f} %>
 <% end %>
--
libgit2 0.21.2