diff -Nru zentyal-monitor-3.1.3/ChangeLog zentyal-monitor-3.1.4/ChangeLog
--- zentyal-monitor-3.1.3/ChangeLog	2013-09-10 21:17:08.000000000 +0000
+++ zentyal-monitor-3.1.4/ChangeLog	2013-09-15 11:35:31.000000000 +0000
@@ -1,3 +1,6 @@
+3.1.4
+	+ Load measure manager on runtime to avoid unneccesary system calls
+	+ Set proper resolution in last week period
 3.1.3
 	+ Remove truncating as we use now proper resolutions
 	+ Set proper resolution (1 point by hour) and time type (datetime)
diff -Nru zentyal-monitor-3.1.3/debian/changelog zentyal-monitor-3.1.4/debian/changelog
--- zentyal-monitor-3.1.3/debian/changelog	2013-09-10 21:17:09.000000000 +0000
+++ zentyal-monitor-3.1.4/debian/changelog	2013-09-15 11:35:31.000000000 +0000
@@ -1,3 +1,9 @@
+zentyal-monitor (3.1.4) precise; urgency=low
+
+  * New upstream release
+
+ -- José A. Calvo <jacalvo@zentyal.com>  Sun, 15 Sep 2013 13:35:31 +0200
+
 zentyal-monitor (3.1.3) precise; urgency=low
 
   * New upstream release
diff -Nru zentyal-monitor-3.1.3/src/EBox/Monitor.pm zentyal-monitor-3.1.4/src/EBox/Monitor.pm
--- zentyal-monitor-3.1.3/src/EBox/Monitor.pm	2013-09-10 21:17:08.000000000 +0000
+++ zentyal-monitor-3.1.4/src/EBox/Monitor.pm	2013-09-15 11:35:31.000000000 +0000
@@ -79,8 +79,6 @@
                                       @_);
     bless($self, $class);
 
-    $self->_setupMeasures();
-
     return $self;
 }
 
@@ -233,7 +231,7 @@
                       . join(', ', map { $_->{name} } @{EBox::Monitor::Configuration::TimePeriods()}));
     }
 
-    my $measure = $self->{measureManager}->measure($measureName);
+    my $measure = $self->_measureManager()->measure($measureName);
     return $measure->fetchData(instance     => $instance,
                                typeInstance => $typeInstance,
                                resolution   => $periodData->{resolution},
@@ -279,7 +277,7 @@
 
     my @measuredData;
     my $atLeastOneReady;
-    foreach my $measure (@{$self->{measureManager}->measures()}) {
+    foreach my $measure (@{$self->_measureManager()->measures()}) {
         try  {
             if(@{$measure->instances()} > 0) {
                 foreach my $instance (@{$measure->instances()}) {
@@ -346,7 +344,7 @@
 sub measures
 {
     my ($self) = @_;
-    return $self->{measureManager}->measures();
+    return $self->_measureManager()->measures();
 }
 
 # Method: measure
@@ -375,7 +373,7 @@
 
     $name or throw EBox::Exceptions::MissingArgument('name');
 
-    return $self->{measureManager}->measure($name);
+    return $self->_measureManager()->measure($name);
 }
 
 # Method: thresholdConfigured
@@ -413,7 +411,7 @@
     $measureName or throw EBox::Exceptions::MissingArgument('measureName');
     $dataSource or throw EBox::Exceptions::MissingArgument('dataSource');
 
-    my $measure = $self->{measureManager}->measure($measureName);
+    my $measure = $self->_measureManager()->measure($measureName);
     my $measureWatchersMod = $self->model('MeasureWatchers');
     my $row = $measureWatchersMod->findValue(measure => $measure->name());
     if ( defined($row) ) {
@@ -509,6 +507,17 @@
     }
 }
 
+# Get the measure manager which holds all measures this module can manage
+sub _measureManager
+{
+    my ($self) = @_;
+
+    unless (exists $self->{measureManager}) {
+        $self->_setupMeasures();
+    }
+    return $self->{measureManager};
+}
+
 # Setup measures
 sub _setupMeasures
 {
@@ -590,7 +599,7 @@
                 my $measureWatcher = $measureWatchersModel->row($id);
                 my $confModel = $measureWatcher->subModel('thresholds');
                 try {
-                    my $measureInstance = $self->{measureManager}->measure($measureWatcher->valueByName('measure'));
+                    my $measureInstance = $self->_measureManager()->measure($measureWatcher->valueByName('measure'));
                     foreach my $confRow (@{$confModel->findDumpThresholds()}) {
                         my $persistElement = $confRow->elementByName('persist');
                         my $persist = 1;
@@ -735,7 +744,7 @@
 {
     my ($self) = @_;
 
-    my $dfMeasure = $self->{measureManager}->measure('Df');
+    my $dfMeasure = $self->_measureManager()->measure('Df');
     my @printableTypeInstances = map { $dfMeasure->printableTypeInstance($_) } @{$dfMeasure->typeInstances()};
     return \@printableTypeInstances;
 }