diff --git a/.codeclimate.yml b/.codeclimate.yml
index 801e4cc..69fb35b 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -9,6 +9,7 @@ engines:
     enabled: true
   rubocop:
     enabled: true
+    channel: rubocop-0-80
 ratings:
   paths:
   - "**.inc"
diff --git a/.rubocop.yml b/.rubocop.yml
index 91ab20a..3330761 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,17 +1,25 @@
 inherit_from: .rubocop_todo.yml
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.7
   Exclude:
     - 'test/**/*'
     - 'spec/**/*'
-    - 'lib/fhir_dstu2_models/fhir/**/*'
-    - 'lib/fhir_dstu2_models/fluentpath/evaluate.rb'
+    - 'lib/fhir_stu3_models/fhir/**/*'
+    - 'lib/fhir_stu3_models/fluentpath/evaluate.rb'
+    - 'lib/**/*.rake'
     - 'tmp/**/*'
     - '*.gemspec'
     - 'bin/*'
-    - 'vendor/**/*'
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
-
 Style/FrozenStringLiteralComment:
   Enabled: false
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+inherit_mode:
+  merge:
+    - Exclude
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f238a70..6ec4af3 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,67 +1,178 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-03-28 10:35:44 -0400 using RuboCop version 0.52.1.
+# on 2021-03-30 17:40:28 -0400 using RuboCop version 0.80.0.
 # 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: 40
+# Offense count: 23
+# Cop supports --auto-correct.
+# Configuration parameters: IndentationWidth.
+Layout/AssignmentIndentation:
+  Enabled: false
+
+# Offense count: 55
+# Cop supports --auto-correct.
+Layout/EmptyLineAfterGuardClause:
+  Exclude:
+    - 'lib/fhir_dstu2_models/bootstrap/definitions.rb'
+    - 'lib/fhir_dstu2_models/bootstrap/generator.rb'
+    - 'lib/fhir_dstu2_models/bootstrap/hashable.rb'
+    - 'lib/fhir_dstu2_models/bootstrap/model.rb'
+    - 'lib/fhir_dstu2_models/bootstrap/preprocess.rb'
+    - 'lib/fhir_dstu2_models/bootstrap/xml.rb'
+    - 'lib/fhir_dstu2_models/deprecate.rb'
+    - 'lib/fhir_dstu2_models/fhir_ext/element_definition.rb'
+    - 'lib/fhir_dstu2_models/fhir_ext/structure_definition.rb'
+    - 'lib/fhir_dstu2_models/fhir_ext/structure_definition_compare.rb'
+    - 'lib/fhir_dstu2_models/fluentpath/evaluate.rb'
+    - 'lib/fhir_dstu2_models/fluentpath/parse.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/EmptyLines:
+  Exclude:
+    - 'lib/fhir_dstu2_models/fhir/resources/ClaimResponse.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
+Layout/EmptyLinesAroundClassBody:
+  Exclude:
+    - 'lib/fhir_dstu2_models/fhir/resources/ClaimResponse.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
+Layout/EmptyLinesAroundModuleBody:
+  Exclude:
+    - 'lib/fhir_dstu2_models/fhir/metadata.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/RescueEnsureAlignment:
+  Exclude:
+    - 'lib/fhir_dstu2_models/bootstrap/hashable.rb'
+
+# Offense count: 19223
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
+# SupportedStylesForExponentOperator: space, no_space
+Layout/SpaceAroundOperators:
+  Enabled: false
+
+# Offense count: 10414
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
+# SupportedStyles: space, no_space, compact
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: false
+
+# Offense count: 120
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: final_newline, final_blank_line
+Layout/TrailingEmptyLines:
+  Enabled: false
+
+# Offense count: 23
+# Cop supports --auto-correct.
+# Configuration parameters: AllowInHeredoc.
+Layout/TrailingWhitespace:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Lint/NonDeterministicRequireOrder:
+  Exclude:
+    - 'lib/fhir_dstu2_models.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Lint/ToJSON:
+  Exclude:
+    - 'lib/fhir_dstu2_models/bootstrap/json.rb'
+    - 'lib/fhir_dstu2_models/fhir_ext/structure_definition_finding.rb'
+
+# Offense count: 41
 Metrics/AbcSize:
-  Max: 423
+  Max: 461
 
-# Offense count: 9
+# Offense count: 10
 # Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
 Metrics/BlockLength:
-  Max: 108
+  Max: 131
 
-# Offense count: 15
+# Offense count: 45
 # Configuration parameters: CountBlocks.
 Metrics/BlockNesting:
-  Max: 5
+  Max: 6
 
-# Offense count: 6
+# Offense count: 7
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 327
+  Max: 470
 
-# Offense count: 27
+# Offense count: 30
 Metrics/CyclomaticComplexity:
-  Max: 69
+  Max: 142
 
-# Offense count: 46
-# Configuration parameters: CountComments.
+# Offense count: 48
+# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
-  Max: 120
+  Max: 463
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 114
+  Max: 520
 
-# Offense count: 25
+# Offense count: 28
 Metrics/PerceivedComplexity:
-  Max: 72
+  Max: 145
 
-# Offense count: 3
-Performance/Caller:
+# Offense count: 118
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
+  Enabled: false
+
+# Offense count: 96
+# Configuration parameters: EnforcedStyle, IgnoredPatterns.
+# SupportedStyles: snake_case, camelCase
+Naming/MethodName:
+  Enabled: false
+
+# Offense count: 4
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: io, id, to, by, on, in, at, ip, db, os, pp
+Naming/MethodParameterName:
   Exclude:
-    - 'lib/fhir_dstu2_models/bootstrap/model.rb'
-    - 'lib/fhir_dstu2_models/deprecate.rb'
+    - 'lib/fhir_dstu2_models/fhir_ext/structure_definition_compare.rb'
 
-# Offense count: 3
+# Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect.
-Performance/HashEachMethods:
+# Configuration parameters: PreferredName.
+Naming/RescuedExceptionsVariableName:
   Exclude:
-    - 'lib/fhir_dstu2_models/bootstrap/definitions.rb'
-    - 'lib/fhir_dstu2_models/bootstrap/model.rb'
-    - 'lib/fhir_dstu2_models/bootstrap/preprocess.rb'
+    - 'lib/fhir_dstu2_models/bootstrap/hashable.rb'
 
-# Offense count: 15
+# Offense count: 1
+# Configuration parameters: .
+# SupportedStyles: inline, group
+Style/AccessModifierDeclarations:
+  EnforcedStyle: inline
+
+# Offense count: 19
 Style/ClassVars:
   Exclude:
     - 'lib/fhir_dstu2_models/bootstrap/definitions.rb'
+    - 'lib/fhir_dstu2_models/fluentpath/evaluate.rb'
     - 'lib/fhir_dstu2_models/fluentpath/parse.rb'
 
 # Offense count: 6
@@ -70,27 +181,25 @@ Style/CommentedKeyword:
     - 'lib/fhir_dstu2_models/bootstrap/hashable.rb'
     - 'lib/fhir_dstu2_models/bootstrap/model.rb'
 
-# Offense count: 14
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
+# SupportedStyles: assign_to_condition, assign_inside_condition
+Style/ConditionalAssignment:
+  Exclude:
+    - 'lib/fhir_dstu2_models/fluentpath/evaluate.rb'
+
+# Offense count: 358
 Style/Documentation:
+  Enabled: false
+
+# Offense count: 16
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
   Exclude:
-    - 'spec/**/*'
-    - 'test/**/*'
-    - 'lib/fhir_dstu2_models/bootstrap/definitions.rb'
-    - 'lib/fhir_dstu2_models/bootstrap/field.rb'
-    - 'lib/fhir_dstu2_models/bootstrap/generator.rb'
-    - 'lib/fhir_dstu2_models/bootstrap/hashable.rb'
-    - 'lib/fhir_dstu2_models/bootstrap/json.rb'
-    - 'lib/fhir_dstu2_models/bootstrap/model.rb'
-    - 'lib/fhir_dstu2_models/bootstrap/preprocess.rb'
-    - 'lib/fhir_dstu2_models/bootstrap/template.rb'
-    - 'lib/fhir_dstu2_models/bootstrap/xml.rb'
-    - 'lib/fhir_dstu2_models/fhir.rb'
-    - 'lib/fhir_dstu2_models/fhir_ext/structure_definition.rb'
-    - 'lib/fhir_dstu2_models/fhir_ext/structure_definition_finding.rb'
-    - 'lib/fhir_dstu2_models/fluentpath/expression.rb'
-    - 'lib/fhir_dstu2_models/fluentpath/parse.rb'
+    - 'lib/fhir_dstu2_models/fluentpath/evaluate.rb'
 
-# Offense count: 29
+# Offense count: 31
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Exclude:
@@ -101,6 +210,7 @@ Style/IfUnlessModifier:
     - 'lib/fhir_dstu2_models/bootstrap/xml.rb'
     - 'lib/fhir_dstu2_models/fhir_ext/structure_definition.rb'
     - 'lib/fhir_dstu2_models/fhir_ext/structure_definition_compare.rb'
+    - 'lib/fhir_dstu2_models/fluentpath/evaluate.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -119,18 +229,36 @@ Style/LambdaCall:
     - 'lib/fhir_dstu2_models/fhir_ext/structure_definition.rb'
 
 # Offense count: 1
-Style/MethodMissing:
+Style/MethodMissingSuper:
   Exclude:
     - 'lib/fhir_dstu2_models/bootstrap/model.rb'
 
-# Offense count: 2
+# Offense count: 1
+Style/MissingRespondToMissing:
+  Exclude:
+    - 'lib/fhir_dstu2_models/bootstrap/model.rb'
+
+# Offense count: 3
+Style/MultipleComparison:
+  Exclude:
+    - 'lib/fhir_dstu2_models/bootstrap/definitions.rb'
+
+# Offense count: 494
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
+Style/MutableConstant:
+  Enabled: false
+
+# Offense count: 3
 # Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle.
+# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Exclude:
     - 'spec/**/*'
     - 'lib/fhir_dstu2_models/fhir_ext/structure_definition_compare.rb'
+    - 'lib/fhir_dstu2_models/fluentpath/evaluate.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -138,7 +266,19 @@ Style/OrAssignment:
   Exclude:
     - 'lib/fhir_dstu2_models/bootstrap/generator.rb'
 
-# Offense count: 17
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantBegin:
+  Exclude:
+    - 'lib/fhir_dstu2_models/fluentpath/expression.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/RescueModifier:
+  Exclude:
+    - 'lib/fhir_dstu2_models/fluentpath/evaluate.rb'
+
+# Offense count: 18
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: implicit, explicit
@@ -152,15 +292,19 @@ Style/RescueStandardError:
     - 'lib/fhir_dstu2_models/fhir.rb'
     - 'lib/fhir_dstu2_models/fhir_ext/structure_definition.rb'
     - 'lib/fhir_dstu2_models/fhir_ext/structure_definition_finding.rb'
+    - 'lib/fhir_dstu2_models/fluentpath/evaluate.rb'
     - 'lib/fhir_dstu2_models/fluentpath/expression.rb'
     - 'lib/fhir_dstu2_models/fluentpath/parse.rb'
 
-# Offense count: 2
+# Offense count: 4
 # Cop supports --auto-correct.
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil.
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
+# AllowedMethods: present?, blank?, presence, try, try!
 Style/SafeNavigation:
   Exclude:
     - 'lib/fhir_dstu2_models/bootstrap/definitions.rb'
+    - 'lib/fhir_dstu2_models/bootstrap/xml.rb'
+    - 'lib/fhir_dstu2_models/fhir_ext/structure_definition.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -170,8 +314,24 @@ Style/StabbyLambdaParentheses:
   Exclude:
     - 'lib/fhir_dstu2_models/fhir_ext/structure_definition.rb'
 
-# Offense count: 309
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 292
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: .
+# SupportedStyles: percent, brackets
+Style/SymbolArray:
+  EnforcedStyle: percent
+  MinSize: 13
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/WhileUntilModifier:
+  Exclude:
+    - 'lib/fhir_dstu2_models/fluentpath/evaluate.rb'
+
+# Offense count: 624
+# Cop supports --auto-correct.
+# Configuration parameters: WordRegex.
+# SupportedStyles: percent, brackets
+Style/WordArray:
+  EnforcedStyle: percent
+  MinSize: 6402
diff --git a/Gemfile.lock b/Gemfile.lock
index 9c7afa1..b1a5fa1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fhir_dstu2_models (1.0.10)
+    fhir_dstu2_models (1.0.11)
       bcp47 (>= 0.3)
       date_time_precision (>= 0.8)
       mime-types (>= 3.0)
@@ -10,11 +10,11 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
+    ast (2.4.2)
     bcp47 (0.3.3)
       i18n
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.8)
     date_time_precision (0.8.1)
     diff-lcs (1.3)
     docile (1.1.5)
@@ -37,8 +37,9 @@ GEM
     guard-test (2.0.8)
       guard-compat (~> 1.2)
       test-unit (~> 3.0)
-    i18n (1.6.0)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.4)
     json (2.3.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -46,7 +47,7 @@ GEM
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
     method_source (0.9.2)
-    mime-types (3.2.2)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
     mini_portile2 (2.5.0)
@@ -60,11 +61,10 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.17.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
     power_assert (1.1.5)
-    powerpack (0.1.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -74,6 +74,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
+    rexml (3.2.4)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -87,14 +88,15 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
-    rubocop (0.52.1)
+    rubocop (0.80.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
-      powerpack (~> 0.1)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.11.0)
     ruby_dep (1.5.0)
     shellany (0.0.1)
     simplecov (0.13.0)
@@ -106,7 +108,7 @@ GEM
     test-unit (3.3.3)
       power_assert
     thor (0.20.3)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
 
 PLATFORMS
   ruby
@@ -120,12 +122,12 @@ DEPENDENCIES
   pry
   rake
   rspec
-  rubocop (= 0.52.1)
+  rubocop (= 0.80)
   simplecov
   test-unit
 
 RUBY VERSION
-   ruby 2.5.8p224
+   ruby 2.7.2p137
 
 BUNDLED WITH
    2.1.4
diff --git a/README.md b/README.md
index 0739adb..e10901d 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ puts sd.warnings
 ```
 # License
 
-Copyright 2014-2018 The MITRE Corporation
+Copyright 2014-2021 The MITRE Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/fhir_dstu2_models.gemspec b/fhir_dstu2_models.gemspec
index 619cddf..19f3819 100644
--- a/fhir_dstu2_models.gemspec
+++ b/fhir_dstu2_models.gemspec
@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'nokogiri-diff'
-  spec.add_development_dependency 'rubocop', '0.52.1'
+  spec.add_development_dependency 'rubocop', '0.80'
   spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'guard-test'
 end
diff --git a/lib/fhir_dstu2_models/version.rb b/lib/fhir_dstu2_models/version.rb
index c78961b..a03b0d8 100644
--- a/lib/fhir_dstu2_models/version.rb
+++ b/lib/fhir_dstu2_models/version.rb
@@ -1,7 +1,7 @@
 module FHIR
   module DSTU2
     module Models
-      VERSION = '1.0.10'.freeze
+      VERSION = '1.0.11'.freeze
     end
   end
 end