diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ca0b496..63be1a7 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,38 +1,31 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-06-10 15:08:26 UTC using RuboCop version 1.9.1.
+# on 2024-06-24 14:45:35 UTC using RuboCop version 1.64.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
-# Configuration parameters: Include.
+# Configuration parameters: Severity, Include.
 # Include: **/*.gemspec
-Gemspec/RubyVersionGlobalsUsage:
+Gemspec/RequiredRubyVersion:
   Exclude:
     - 'fog-libvirt.gemspec'
 
-# Offense count: 29
-# Cop supports --auto-correct.
+# Offense count: 30
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: with_first_element, with_fixed_indentation
 Layout/ArrayAlignment:
   Exclude:
+    - 'lib/fog/libvirt/requests/compute/list_networks.rb'
     - 'tests/libvirt/models/compute/nic_tests.rb'
     - 'tests/libvirt/models/compute/server_tests.rb'
     - 'tests/libvirt/models/compute/volume_tests.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleAlignWith.
-# SupportedStylesAlignWith: either, start_of_block, start_of_line
-Layout/BlockAlignment:
-  Exclude:
-    - 'tests/libvirt/models/compute/pools_tests.rb'
-
-# Offense count: 10
-# Cop supports --auto-correct.
+# Offense count: 12
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, IndentOneStep, IndentationWidth.
 # SupportedStyles: case, end
 Layout/CaseIndentation:
@@ -44,13 +37,13 @@ Layout/CaseIndentation:
     - 'lib/fog/libvirt/requests/compute/list_volumes.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Layout/ClosingParenthesisIndentation:
   Exclude:
     - 'lib/fog/libvirt/models/compute/server.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: leading, trailing
 Layout/DotPosition:
@@ -58,7 +51,7 @@ Layout/DotPosition:
     - 'minitests/server/user_data_iso_test.rb'
 
 # Offense count: 13
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Layout/EmptyLineAfterGuardClause:
   Exclude:
     - '.irbrc'
@@ -68,21 +61,8 @@ Layout/EmptyLineAfterGuardClause:
     - 'lib/fog/libvirt/requests/compute/list_interfaces.rb'
     - 'lib/fog/libvirt/requests/compute/update_display.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterMagicComment:
-  Exclude:
-    - 'fog-libvirt.gemspec'
-
-# Offense count: 7
-# Cop supports --auto-correct.
-# Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
-Layout/EmptyLineBetweenDefs:
-  Exclude:
-    - 'tests/helpers/formats_helper.rb'
-
-# Offense count: 6
-# Cop supports --auto-correct.
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: around, only_before
 Layout/EmptyLinesAroundAccessModifier:
@@ -92,31 +72,30 @@ Layout/EmptyLinesAroundAccessModifier:
     - 'lib/fog/libvirt/models/compute/util/uri.rb'
     - 'lib/fog/libvirt/requests/compute/list_interfaces.rb'
     - 'lib/fog/libvirt/requests/compute/list_networks.rb'
-    - 'lib/fog/libvirt/requests/compute/list_pools.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowAliasSyntax, AllowedMethods.
 # AllowedMethods: alias_method, public, protected, private
 Layout/EmptyLinesAroundAttributeAccessor:
   Exclude:
     - 'lib/fog/libvirt/models/compute/volume.rb'
 
-# Offense count: 34
-# Cop supports --auto-correct.
+# Offense count: 36
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty_lines, no_empty_lines
 Layout/EmptyLinesAroundBlockBody:
   Enabled: false
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Layout/EmptyLinesAroundExceptionHandlingKeywords:
   Exclude:
     - 'lib/fog/libvirt/compute.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyleAlignWith, Severity.
 # SupportedStylesAlignWith: keyword, variable, start_of_line
 Layout/EndAlignment:
@@ -124,7 +103,7 @@ Layout/EndAlignment:
     - 'lib/fog/bin/libvirt.rb'
 
 # Offense count: 6
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
 Layout/ExtraSpacing:
   Exclude:
@@ -133,21 +112,20 @@ Layout/ExtraSpacing:
     - 'tests/libvirt/requests/compute/define_domain_tests.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: consistent, consistent_relative_to_receiver, special_for_inner_method_call, special_for_inner_method_call_in_parentheses
 Layout/FirstArgumentIndentation:
   Exclude:
     - 'lib/fog/libvirt/models/compute/server.rb'
 
-# Offense count: 11
-# Cop supports --auto-correct.
+# Offense count: 9
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
 Layout/FirstHashElementIndentation:
   Exclude:
     - '.irbrc'
-    - 'bin/create_s390x_vm.rb'
     - 'lib/fog/libvirt/requests/compute/list_domains.rb'
     - 'lib/fog/libvirt/requests/compute/list_interfaces.rb'
     - 'lib/fog/libvirt/requests/compute/list_networks.rb'
@@ -155,8 +133,8 @@ Layout/FirstHashElementIndentation:
     - 'lib/fog/libvirt/requests/compute/list_volumes.rb'
     - 'minitests/test_helper.rb'
 
-# Offense count: 97
-# Cop supports --auto-correct.
+# Offense count: 96
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
 # SupportedColonStyles: key, separator, table
@@ -171,18 +149,9 @@ Layout/HashAlignment:
     - 'lib/fog/libvirt/requests/compute/list_networks.rb'
     - 'lib/fog/libvirt/requests/compute/list_pools.rb'
     - 'lib/fog/libvirt/requests/compute/list_volumes.rb'
-    - 'tests/helpers/mock_helper.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: Width, IgnoredPatterns.
-Layout/IndentationWidth:
-  Exclude:
-    - 'lib/fog/libvirt/models/compute/util/util.rb'
-    - 'lib/fog/libvirt/requests/compute/list_volumes.rb'
 
 # Offense count: 15
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
 Layout/LeadingCommentSpace:
   Exclude:
@@ -194,13 +163,13 @@ Layout/LeadingCommentSpace:
     - 'tests/libvirt/requests/compute/create_domain_tests.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Layout/LeadingEmptyLines:
   Exclude:
     - 'lib/fog/libvirt/requests/compute/libversion.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: symmetrical, new_line, same_line
 Layout/MultilineArrayBraceLayout:
@@ -208,21 +177,21 @@ Layout/MultilineArrayBraceLayout:
     - 'lib/fog/libvirt/requests/compute/list_networks.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Layout/MultilineBlockLayout:
   Exclude:
     - 'tests/libvirt/requests/compute/dhcp_leases_tests.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: aligned, indented, indented_relative_to_receiver
 Layout/MultilineMethodCallIndentation:
   Exclude:
     - 'minitests/server/user_data_iso_test.rb'
 
-# Offense count: 11
-# Cop supports --auto-correct.
+# Offense count: 10
+# This cop supports safe autocorrection (--autocorrect).
 Layout/SpaceAfterComma:
   Exclude:
     - 'fog-libvirt.gemspec'
@@ -231,13 +200,13 @@ Layout/SpaceAfterComma:
     - 'lib/fog/libvirt/requests/compute/list_domains.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Layout/SpaceAfterMethodName:
   Exclude:
     - 'lib/fog/libvirt/requests/compute/clone_volume.rb'
 
 # Offense count: 23
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: space, no_space
 Layout/SpaceAroundEqualsInParameterDefault:
@@ -256,10 +225,11 @@ Layout/SpaceAroundEqualsInParameterDefault:
     - 'lib/fog/libvirt/requests/compute/list_volumes.rb'
     - 'lib/fog/libvirt/requests/compute/volume_action.rb'
 
-# Offense count: 68
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
+# Offense count: 67
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator, EnforcedStyleForRationalLiterals.
 # SupportedStylesForExponentOperator: space, no_space
+# SupportedStylesForRationalLiterals: space, no_space
 Layout/SpaceAroundOperators:
   Exclude:
     - 'Rakefile'
@@ -274,7 +244,7 @@ Layout/SpaceAroundOperators:
     - 'lib/fog/libvirt/requests/compute/list_pools.rb'
 
 # Offense count: 8
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
 # SupportedStyles: space, no_space
 # SupportedStylesForEmptyBraces: space, no_space
@@ -289,14 +259,14 @@ Layout/SpaceBeforeBlockBraces:
     - 'tests/libvirt/models/compute/volume_tests.rb'
 
 # Offense count: 7
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Layout/SpaceBeforeComma:
   Exclude:
     - '.irbrc'
     - 'lib/fog/libvirt/models/compute/server.rb'
 
 # Offense count: 4
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowForAlignment.
 Layout/SpaceBeforeFirstArg:
   Exclude:
@@ -304,7 +274,7 @@ Layout/SpaceBeforeFirstArg:
     - 'tests/libvirt/requests/compute/define_domain_tests.rb'
 
 # Offense count: 9
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBrackets.
 # SupportedStyles: space, no_space, compact
 # SupportedStylesForEmptyBrackets: space, no_space
@@ -319,8 +289,8 @@ Layout/SpaceInsideArrayLiteralBrackets:
     - 'tests/libvirt/models/compute/server_tests.rb'
     - 'tests/libvirt/models/compute/volume_tests.rb'
 
-# Offense count: 25
-# Cop supports --auto-correct.
+# Offense count: 24
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
 # SupportedStylesForEmptyBraces: space, no_space
@@ -337,8 +307,8 @@ Layout/SpaceInsideBlockBraces:
     - 'tests/libvirt/requests/compute/create_domain_tests.rb'
     - 'tests/libvirt/requests/compute/define_domain_tests.rb'
 
-# Offense count: 31
-# Cop supports --auto-correct.
+# Offense count: 30
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
 # SupportedStyles: space, no_space, compact
 # SupportedStylesForEmptyBraces: space, no_space
@@ -359,9 +329,9 @@ Layout/SpaceInsideHashLiteralBraces:
     - 'tests/libvirt/requests/compute/update_display.rb'
 
 # Offense count: 3
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: space, no_space
+# SupportedStyles: space, compact, no_space
 Layout/SpaceInsideParens:
   Exclude:
     - 'lib/fog/libvirt/models/compute/pool.rb'
@@ -369,14 +339,20 @@ Layout/SpaceInsideParens:
     - 'tests/libvirt/requests/compute/create_domain_tests.rb'
 
 # Offense count: 4
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Layout/SpaceInsidePercentLiteralDelimiters:
   Exclude:
     - 'tests/libvirt/compute_tests.rb'
     - 'tests/libvirt/models/compute/server_tests.rb'
 
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Lint/ErbNewArguments:
+  Exclude:
+    - 'lib/fog/libvirt/models/compute/util/util.rb'
+
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Lint/ParenthesesAsGroupedExpression:
   Exclude:
     - 'lib/fog/libvirt/requests/compute/update_display.rb'
@@ -397,33 +373,35 @@ Lint/ShadowingOuterLocalVariable:
     - 'lib/fog/libvirt/models/compute/server.rb'
 
 # Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AutoCorrect, IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
 Lint/UnusedBlockArgument:
   Exclude:
     - 'lib/fog/libvirt/requests/compute/list_domains.rb'
     - 'minitests/server/user_data_iso_test.rb'
 
 # Offense count: 22
-# Cop supports --auto-correct.
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AutoCorrect, AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
 Lint/UnusedMethodArgument:
   Enabled: false
 
 # Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AutoCorrect.
 Lint/UselessAssignment:
   Exclude:
     - 'lib/fog/bin/libvirt.rb'
     - 'lib/fog/libvirt/requests/compute/upload_volume.rb'
 
 # Offense count: 13
-# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 38
 
 # Offense count: 9
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
-# IgnoredMethods: refine
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
+# AllowedMethods: refine
 Metrics/BlockLength:
   Max: 80
 
@@ -432,23 +410,18 @@ Metrics/BlockLength:
 Metrics/BlockNesting:
   Max: 4
 
-# Offense count: 1
-# Configuration parameters: CountComments, CountAsOne.
-Metrics/ClassLength:
-  Max: 372
-
 # Offense count: 7
-# Configuration parameters: IgnoredMethods.
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 11
 
 # Offense count: 29
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 24
 
 # Offense count: 5
-# Configuration parameters: IgnoredMethods.
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 12
 
@@ -459,20 +432,20 @@ Naming/AccessorMethodName:
 
 # Offense count: 1
 # Configuration parameters: ForbiddenDelimiters.
-# ForbiddenDelimiters: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
+# ForbiddenDelimiters: (?i-mx:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
   Exclude:
     - 'lib/fog/bin/libvirt.rb'
 
 # Offense count: 1
-# Configuration parameters: EnforcedStyle, IgnoredPatterns.
+# Configuration parameters: EnforcedStyle, AllowedPatterns.
 # SupportedStyles: snake_case, camelCase
 Naming/MethodName:
   Exclude:
     - 'lib/fog/libvirt/requests/compute/list_domains.rb'
 
-# Offense count: 7
-# Cop supports --auto-correct.
+# Offense count: 6
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: separated, grouped
 Style/AccessorGrouping:
@@ -481,7 +454,7 @@ Style/AccessorGrouping:
     - 'lib/fog/libvirt/models/compute/server.rb'
 
 # Offense count: 4
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: prefer_alias, prefer_alias_method
 Style/Alias:
@@ -489,7 +462,7 @@ Style/Alias:
     - 'lib/fog/libvirt/models/compute/server.rb'
 
 # Offense count: 5
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, conditionals
 Style/AndOr:
@@ -498,20 +471,20 @@ Style/AndOr:
     - 'lib/fog/libvirt/models/compute/server.rb'
 
 # Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, AllowedMethods, AllowedPatterns, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
 # SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
 # ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
 # FunctionalMethods: let, let!, subject, watch
-# IgnoredMethods: lambda, proc, it
+# AllowedMethods: lambda, proc, it
 Style/BlockDelimiters:
   Exclude:
     - 'lib/fog/libvirt/requests/compute/list_domains.rb'
     - 'tests/libvirt/models/compute/server_tests.rb'
     - 'tests/libvirt/requests/compute/dhcp_leases_tests.rb'
 
-# Offense count: 20
-# Cop supports --auto-correct.
+# Offense count: 22
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: is_a?, kind_of?
 Style/ClassCheck:
@@ -523,7 +496,7 @@ Style/ClassVars:
     - 'lib/fog/bin/libvirt.rb'
 
 # Offense count: 5
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/ColonMethodCall:
   Exclude:
     - 'lib/fog/bin/libvirt.rb'
@@ -531,13 +504,13 @@ Style/ColonMethodCall:
     - 'lib/fog/libvirt/models/compute/server.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
 Style/CommentedKeyword:
   Exclude:
     - 'lib/fog/bin/libvirt.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
 # SupportedStyles: assign_to_condition, assign_inside_condition
 Style/ConditionalAssignment:
@@ -546,25 +519,26 @@ Style/ConditionalAssignment:
     - 'tests/helpers/formats_helper.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/DefWithParentheses:
   Exclude:
     - 'lib/fog/libvirt/requests/compute/libversion.rb'
 
-# Offense count: 75
+# Offense count: 81
+# Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
 
 # Offense count: 2
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/EmptyLiteral:
   Exclude:
     - '.irbrc'
     - 'lib/fog/libvirt/requests/compute/get_node_info.rb'
 
 # Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AutoCorrect, EnforcedStyle.
 # SupportedStyles: compact, expanded
 Style/EmptyMethod:
   Exclude:
@@ -575,12 +549,13 @@ Style/EmptyMethod:
     - 'lib/fog/libvirt/requests/compute/upload_volume.rb'
 
 # Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
 Style/EvalWithLocation:
   Exclude:
     - 'lib/fog/bin/libvirt.rb'
 
 # Offense count: 4
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/ExpandPathArguments:
   Exclude:
     - 'fog-libvirt.gemspec'
@@ -588,13 +563,13 @@ Style/ExpandPathArguments:
     - 'tests/helper.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/ExplicitBlockArgument:
   Exclude:
     - 'minitests/server/user_data_iso_test.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: each, for
 Style/For:
@@ -602,7 +577,7 @@ Style/For:
     - 'lib/fog/bin/libvirt.rb'
 
 # Offense count: 72
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
@@ -615,7 +590,8 @@ Style/GlobalVars:
     - '.irbrc'
 
 # Offense count: 9
-# Configuration parameters: MinBodyLength.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
 Style/GuardClause:
   Exclude:
     - 'lib/fog/libvirt/models/compute/server.rb'
@@ -623,7 +599,7 @@ Style/GuardClause:
     - 'lib/fog/libvirt/requests/compute/dhcp_leases.rb'
 
 # Offense count: 8
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Exclude:
     - 'lib/fog/libvirt/models/compute/server.rb'
@@ -632,21 +608,21 @@ Style/IfUnlessModifier:
     - 'tests/helpers/mock_helper.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: InverseMethods, InverseBlocks.
 Style/InverseMethods:
   Exclude:
     - 'tests/libvirt/models/compute/volume_tests.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
 Style/LineEndConcatenation:
   Exclude:
     - 'lib/fog/libvirt/models/compute/server.rb'
 
 # Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoredMethods.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Style/MethodCallWithoutArgsParentheses:
   Exclude:
     - 'lib/fog/libvirt/models/compute/server.rb'
@@ -656,7 +632,7 @@ Style/MethodCallWithoutArgsParentheses:
     - 'tests/libvirt/requests/compute/define_domain_tests.rb'
 
 # Offense count: 17
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
 Style/MethodDefParentheses:
@@ -671,13 +647,13 @@ Style/MethodDefParentheses:
     - 'lib/fog/libvirt/requests/compute/list_volumes.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/MultilineIfModifier:
   Exclude:
     - 'lib/fog/libvirt/requests/compute/get_node_info.rb'
 
 # Offense count: 4
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: literals, strict
 Style/MutableConstant:
@@ -686,8 +662,8 @@ Style/MutableConstant:
     - 'lib/fog/libvirt/models/compute/nic.rb'
     - 'lib/fog/libvirt/version.rb'
 
-# Offense count: 3
-# Cop supports --auto-correct.
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: both, prefix, postfix
 Style/NegatedIf:
@@ -695,17 +671,16 @@ Style/NegatedIf:
     - 'lib/fog/libvirt/models/compute/server.rb'
     - 'lib/fog/libvirt/requests/compute/dhcp_leases.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, MinBodyLength.
 # SupportedStyles: skip_modifier_ifs, always
 Style/Next:
   Exclude:
     - 'lib/fog/bin/libvirt.rb'
-    - 'lib/fog/libvirt/models/compute/server.rb'
 
 # Offense count: 7
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/Not:
   Exclude:
     - 'lib/fog/libvirt/models/compute/server.rb'
@@ -716,15 +691,15 @@ Style/Not:
     - 'tests/libvirt/models/compute/volumes_tests.rb'
     - 'tests/libvirt/requests/compute/update_autostart_tests.rb'
 
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: Strict.
+# Offense count: 8
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Strict, AllowedNumbers, AllowedPatterns.
 Style/NumericLiterals:
   MinDigits: 10
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IgnoredMethods.
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Exclude:
@@ -740,7 +715,7 @@ Style/OptionalBooleanParameter:
     - 'tests/helpers/formats_helper.rb'
 
 # Offense count: 7
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
   Exclude:
@@ -750,7 +725,7 @@ Style/PercentLiteralDelimiters:
     - 'tests/libvirt/models/compute/server_tests.rb'
 
 # Offense count: 21
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowedCompactTypes.
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:
@@ -764,7 +739,7 @@ Style/RaiseArgs:
     - 'lib/fog/libvirt/models/compute/volume.rb'
 
 # Offense count: 4
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/RedundantBegin:
   Exclude:
     - 'lib/fog/libvirt/models/compute/server.rb'
@@ -773,7 +748,7 @@ Style/RedundantBegin:
     - 'tests/libvirt/requests/compute/create_domain_tests.rb'
 
 # Offense count: 15
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
 Style/RedundantInterpolation:
   Exclude:
     - 'Rakefile'
@@ -786,16 +761,17 @@ Style/RedundantInterpolation:
     - 'tests/libvirt/models/compute/volume_tests.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/RedundantParentheses:
   Exclude:
     - 'lib/fog/libvirt/models/compute/volume.rb'
 
-# Offense count: 23
-# Cop supports --auto-correct.
+# Offense count: 24
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowMultipleReturnValues.
 Style/RedundantReturn:
   Exclude:
+    - 'lib/fog/libvirt/compute.rb'
     - 'lib/fog/libvirt/models/compute/server.rb'
     - 'lib/fog/libvirt/models/compute/util/uri.rb'
     - 'lib/fog/libvirt/requests/compute/dhcp_leases.rb'
@@ -804,7 +780,7 @@ Style/RedundantReturn:
     - 'lib/fog/libvirt/requests/compute/list_volumes.rb'
 
 # Offense count: 19
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/RedundantSelf:
   Exclude:
     - 'lib/fog/bin/libvirt.rb'
@@ -816,13 +792,13 @@ Style/RedundantSelf:
     - 'lib/fog/libvirt/models/compute/volumes.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
 Style/RedundantSort:
   Exclude:
     - 'lib/fog/libvirt/models/compute/server.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, AllowInnerSlashes.
 # SupportedStyles: slashes, percent_r, mixed
 Style/RegexpLiteral:
@@ -830,7 +806,7 @@ Style/RegexpLiteral:
     - 'fog-libvirt.gemspec'
 
 # Offense count: 14
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/RescueModifier:
   Exclude:
     - 'lib/fog/libvirt/requests/compute/get_node_info.rb'
@@ -839,7 +815,7 @@ Style/RescueModifier:
     - 'lib/fog/libvirt/requests/compute/list_volumes.rb'
 
 # Offense count: 7
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: implicit, explicit
 Style/RescueStandardError:
@@ -849,9 +825,9 @@ Style/RescueStandardError:
     - 'lib/fog/libvirt/models/compute/server.rb'
     - 'tests/libvirt/requests/compute/create_domain_tests.rb'
 
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
+# Offense count: 5
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
 # AllowedMethods: present?, blank?, presence, try, try!
 Style/SafeNavigation:
   Exclude:
@@ -859,59 +835,51 @@ Style/SafeNavigation:
     - 'lib/fog/libvirt/requests/compute/upload_volume.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: use_perl_names, use_english_names
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: RequireEnglish, EnforcedStyle.
+# SupportedStyles: use_perl_names, use_english_names, use_builtin_english_names
 Style/SpecialGlobalVars:
   Exclude:
     - 'lib/fog/libvirt/compute.rb'
     - 'minitests/test_helper.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Mode.
 Style/StringConcatenation:
   Exclude:
     - 'Rakefile'
 
 # Offense count: 12
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: MinSize.
 # SupportedStyles: percent, brackets
 Style/SymbolArray:
   EnforcedStyle: brackets
 
 # Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoredMethods.
-# IgnoredMethods: respond_to, define_method
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments.
+# AllowedMethods: define_method
 Style/SymbolProc:
   Exclude:
     - 'lib/fog/bin/libvirt.rb'
     - 'lib/fog/libvirt/models/compute/server.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInArguments:
-  Exclude:
-    - 'bin/create_s390x_vm.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma
 Style/TrailingCommaInArrayLiteral:
   Exclude:
     - 'lib/fog/libvirt/models/compute/server.rb'
 
-# Offense count: 9
-# Cop supports --auto-correct.
+# Offense count: 7
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma
 Style/TrailingCommaInHashLiteral:
   Exclude:
-    - 'bin/create_s390x_vm.rb'
     - 'lib/fog/libvirt/models/compute/server.rb'
     - 'lib/fog/libvirt/models/compute/volume.rb'
     - 'lib/fog/libvirt/requests/compute/list_domains.rb'
@@ -920,13 +888,13 @@ Style/TrailingCommaInHashLiteral:
     - 'tests/helpers/mock_helper.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/UnlessElse:
   Exclude:
     - 'lib/fog/libvirt/models/compute/util/uri.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: WordRegex.
 # SupportedStyles: percent, brackets
 Style/WordArray: