diff --git a/Gemfile b/Gemfile
index 2143b1258..0bdf9ed20 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,6 +21,7 @@ gem 'bcrypt'
 gem 'programr', :git => "http://github.com/robertjwhitney/programr.git"
 gem 'process_helper'
 gem 'ovirt-engine-sdk'
+gem 'duplicate'
 
 #development only gems go here
 group :test, :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index c20005851..192a102be 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -13,6 +13,7 @@ GEM
     concurrent-ruby (1.0.5)
     credy (0.2.1)
       thor (~> 0.19.1)
+    duplicate (1.1.1)
     facter (2.5.1)
     faker (1.9.1)
       i18n (>= 0.7)
@@ -102,6 +103,7 @@ DEPENDENCIES
   bcrypt
   cinch
   credy
+  duplicate
   faker
   forgery
   librarian-puppet
diff --git a/lib/objects/system.rb b/lib/objects/system.rb
index 30ddddeec..5614f7d68 100644
--- a/lib/objects/system.rb
+++ b/lib/objects/system.rb
@@ -1,5 +1,6 @@
 require 'json'
 require 'base64'
+require 'duplicate'
 
 class System
 
@@ -8,7 +9,12 @@ class System
   attr_accessor :module_selectors # (filters)
   attr_accessor :module_selections # (after resolution)
   attr_accessor :num_actioned_module_conflicts
-  attr_accessor :options #(command line options hash)
+
+  # Attributes for resetting retry loop
+  attr_accessor :available_mods #(command line options hash)
+  attr_accessor :original_datastores #(command line options hash)
+  attr_accessor :original_module_selectors #(command line options hash)
+  attr_accessor :original_available_modules #(command line options hash)
 
   # Initalizes System object
   # @param [Object] name of the system
@@ -28,7 +34,57 @@ class System
   # @return [Object] the list of selected modules
   def resolve_module_selection(available_modules, options)
     retry_count = 0
-    # Replace $IP_addresses with options ip_ranges if required
+
+    # duplicate original data and parameters for retries
+    self.available_mods = duplicate(available_modules)
+    self.original_datastores = duplicate($datastore)
+    self.original_module_selectors = duplicate(module_selectors)
+    self.original_available_modules = duplicate(available_mods)
+
+    begin
+      selected_modules = []
+      self.num_actioned_module_conflicts = 0
+      replace_datastore_ips(options)
+
+      # for each module specified in the scenario
+      module_selectors.each do |module_filter|
+        selected_modules += select_modules(module_filter.module_type, module_filter.attributes, available_mods, selected_modules, module_filter.unique_id, module_filter.write_output_variable, module_filter.write_to_module_with_id, module_filter.received_inputs, module_filter.default_inputs_literals, module_filter.write_to_datastore, module_filter.received_datastores, module_filter.write_module_path_to_datastore)
+      end
+      selected_modules
+
+    rescue RuntimeError=>e
+      # When the scenario fails to be resolved
+      # bruteforce conflict resolution (could be more intelligent)
+
+      Print.err 'Failed to resolve scenario.'
+      if self.num_actioned_module_conflicts > 0
+        Print.err "During scenario generation #{num_actioned_module_conflicts} module conflict(s) occured..."
+      else
+        Print.err 'No conflicts, but failed to resolve scenario -- this is a sign there is something wrong in the config (scenario / modules)'
+        Print.err 'Please review the scenario -- something is wrong.'
+        exit
+      end
+      if retry_count < RETRIES_LIMIT
+        Print.err "Re-attempting to resolve scenario (##{retry_count + 1})..."
+        sleep 1
+        retry_count += 1
+        # reset module_filters recieved inputs
+        # We need a way to distinguish between the received inputs from values vs from generators
+        self.module_selectors = self.original_module_selectors.clone
+        self.available_mods = self.original_available_modules.clone
+        # reset globals
+        $datastore = self.original_datastores.clone
+        $datastore_iterators = {}
+        retry
+      else
+        Print.err "Tried re-randomising #{RETRIES_LIMIT} times. Still no joy."
+        Print.err 'Please review the scenario -- something is wrong.'
+        exit
+      end
+    end
+  end
+
+  def replace_datastore_ips(options)
     begin
       if options[:ip_ranges] and $datastore['IP_addresses'] and !$datastore['replaced_ranges']
         unused_opts_ranges = options[:ip_ranges].clone
@@ -78,43 +134,6 @@ class System
       Print.err("Fatal: Not enough ranges were provided with --network-ranges. Provided: #{options[:ip_ranges].size} Required: #{required_ranges.uniq.size}")
       exit
     end
-
-    begin
-      selected_modules = []
-      self.num_actioned_module_conflicts = 0
-
-      # for each module specified in the scenario
-      module_selectors.each do |module_filter|
-        selected_modules += select_modules(module_filter.module_type, module_filter.attributes, available_modules, selected_modules, module_filter.unique_id, module_filter.write_output_variable, module_filter.write_to_module_with_id, module_filter.received_inputs, module_filter.default_inputs_literals, module_filter.write_to_datastore, module_filter.received_datastores, module_filter.write_module_path_to_datastore)
-      end
-      selected_modules
-
-    rescue RuntimeError=>e
-      # When the scenario fails to be resolved
-      # bruteforce conflict resolution (could be more intelligent)
-
-      Print.err 'Failed to resolve scenario.'
-      if self.num_actioned_module_conflicts > 0
-        Print.err "During scenario generation #{num_actioned_module_conflicts} module conflict(s) occured..."
-      else
-        Print.err 'No conflicts, but failed to resolve scenario -- this is a sign there is something wrong in the config (scenario / modules)'
-        Print.err 'Please review the scenario -- something is wrong.'
-        exit
-      end
-      if retry_count < RETRIES_LIMIT
-        Print.err "Re-attempting to resolve scenario (##{retry_count + 1})..."
-        sleep 1
-        retry_count += 1
-        # reset globals
-        $datastore = {}
-        $datastore_iterators = {}
-        retry
-      else
-        Print.err "Tried re-randomising #{RETRIES_LIMIT} times. Still no joy."
-        Print.err 'Please review the scenario -- something is wrong.'
-        exit
-      end
-    end
   end
 
   # returns a list containing a module (plus any default input modules and dependencies recursively) of the module type with the required attributes
diff --git a/modules/services/unix/http/tomcat/secgen_metadata.xml b/modules/services/unix/http/tomcat/secgen_metadata.xml
index d8c218fc3..3a92b4b44 100644
--- a/modules/services/unix/http/tomcat/secgen_metadata.xml
+++ b/modules/services/unix/http/tomcat/secgen_metadata.xml
@@ -9,7 +9,7 @@
   <module_license>Apache v2</module_license>
   <description>Puppetlabs Apache Tomcat module</description>
 
-  <type>servlet</type>
+  <type>httpd</type>
   <type>tomcat</type>
   <platform>linux</platform>