diff --git a/generators/wiki/cpu_parameters.rb b/generators/wiki/cpu_parameters.rb
index e7ebc7c69cc8d1d87437e541d26ca3bd5ef7a081..930d3641232315a5d2f50bcc13494db82333768e 100644
--- a/generators/wiki/cpu_parameters.rb
+++ b/generators/wiki/cpu_parameters.rb
@@ -64,7 +64,7 @@ options = WikiGenerator::parse_options
 if (options)
   ret = 2
   begin
-    ret = WikiGenerator::exec(generator, options)
+    ret = generator.exec(options)
   rescue MediawikiApi::ApiError => e
     puts e, e.backtrace
     ret = 3
diff --git a/generators/wiki/disk_reservation.rb b/generators/wiki/disk_reservation.rb
index cb9b409cbda9719b5df43337c995e01c28d1b250..735eeeed78bf625ceba7aeca18e28a34586a2f5a 100644
--- a/generators/wiki/disk_reservation.rb
+++ b/generators/wiki/disk_reservation.rb
@@ -68,7 +68,7 @@ options = WikiGenerator::parse_options
 if (options)
   ret = 2
   begin
-    ret = WikiGenerator::exec(generator, options)
+    ret = generator.exec(options)
   rescue MediawikiApi::ApiError => e
     puts e, e.backtrace
     ret = 3
diff --git a/generators/wiki/hardware.rb b/generators/wiki/hardware.rb
index 0b9484786ac50eacc2aaffb44def8dd53ec74a5e..3eb3e0f49d88e8bc2bcd22fd1bd003757deae51a 100644
--- a/generators/wiki/hardware.rb
+++ b/generators/wiki/hardware.rb
@@ -276,7 +276,7 @@ options = WikiGenerator::parse_options
 if (options)
   ret = 2
   begin
-    ret = WikiGenerator::exec(generator, options)
+    ret = generator.exec(options)
   rescue MediawikiApi::ApiError => e
     puts e, e.backtrace
     ret = 3
diff --git a/generators/wiki/lib/wiki_generator.rb b/generators/wiki/lib/wiki_generator.rb
index ebd5cbd4af471fb2019f56abfad765b6cff460a9..bc61abafea099a20a1a3adcd24dbb03a78fc8586 100644
--- a/generators/wiki/lib/wiki_generator.rb
+++ b/generators/wiki/lib/wiki_generator.rb
@@ -6,6 +6,8 @@ require "optparse"
 require "mediawiki_api"
 require "diffy"
 require "mw_utils"
+require 'date'
+require 'pp'
 
 class WikiGenerator
 
@@ -140,24 +142,24 @@ class WikiGenerator
   end
 
   #Execute actions on generator based on given options
-  def self.exec(generator, options)
-    generator.generate_content()
+  def exec(options)
+    generate_content()
 
     ret = true
     #Login only if we need to
     if (options[:diff] || options[:update])
-      generator.login(options)
+      login(options)
     end
     if (options[:diff])
-      ret &= generator.diff_page if generator.instance_variable_get('@generated_content')
-      ret &= generator.diff_files if generator.instance_variable_get('@files')
+      ret &= diff_page if instance_variable_get('@generated_content')
+      ret &= diff_files if instance_variable_get('@files')
     end
     if (options[:print])
-      generator.print
+      print
     end
     if (options[:update])
-      generator.update_page if generator.instance_variable_get('@generated_content')
-      generator.update_files if generator.instance_variable_get('@files')
+      update_page if instance_variable_get('@generated_content')
+      update_files if instance_variable_get('@files')
     end
     return ret
   end
diff --git a/generators/wiki/oar_properties.rb b/generators/wiki/oar_properties.rb
index be0b19cfccce5cc0fca166129156685c125a967b..b094d3aefe421cd1b9db1c71542ad1a9a93b478c 100644
--- a/generators/wiki/oar_properties.rb
+++ b/generators/wiki/oar_properties.rb
@@ -228,7 +228,7 @@ options = WikiGenerator::parse_options
 if (options)
   ret = 2
   begin
-    ret = WikiGenerator::exec(generator, options)
+    ret = generator.exec(options)
   rescue MediawikiApi::ApiError => e
     puts e, e.backtrace
     ret = 3
diff --git a/generators/wiki/site_hardware.rb b/generators/wiki/site_hardware.rb
index d63be846b7da8963df3ab1f681ba0a040870b47d..afcf692a3e7b2c50ab7d205a055650cad5e35c4d 100644
--- a/generators/wiki/site_hardware.rb
+++ b/generators/wiki/site_hardware.rb
@@ -270,7 +270,7 @@ if __FILE__ == $0
       ret = true
       generators = options[:sites].map{ |site| SiteHardwareGenerator.new(site.capitalize + ':Hardware', site) }
       generators.each{ |generator|
-        ret &= WikiGenerator::exec(generator, options)
+        ret &= generator.exec(options)
       }
     rescue MediawikiApi::ApiError => e
       puts e, e.backtrace
diff --git a/generators/wiki/site_network.rb b/generators/wiki/site_network.rb
index 38f3f3df412a22d280b9228a5c277e36c5053e27..b1e0cb05ebe0169f516d9d38c1b6dfe028ec87c2 100644
--- a/generators/wiki/site_network.rb
+++ b/generators/wiki/site_network.rb
@@ -37,7 +37,7 @@ if (options)
     ret = true
     generators = options[:sites].map{ |site| SiteNetworkGenerator.new('Generated/' + site.capitalize + 'Network', site) }
     generators.each{ |generator|
-      ret &= WikiGenerator::exec(generator, options)
+      ret &= generator.exec(options)
     }
   rescue MediawikiApi::ApiError => e
     puts e, e.backtrace