diff --git a/CHANGELOG.md b/CHANGELOG.md
index 872d9a2..44604fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.4.7] - 2021.08.09
+
+### Updated
+
+- Updated gem codebase, refactored `Truemail::ContextHelper`
+- Updated tests
+- Updated gem development dependencies
+- Updated gem version
+
 ## [2.4.6] - 2021.07.10
 
 ### Fixed
diff --git a/Gemfile.lock b/Gemfile.lock
index e4094cd..f3b992c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    truemail (2.4.6)
+    truemail (2.4.7)
       simpleidn (~> 0.2.1)
 
 GEM
@@ -56,10 +56,10 @@ GEM
     public_suffix (4.0.6)
     rainbow (3.0.0)
     rake (13.0.6)
-    reek (6.0.4)
+    reek (6.0.5)
       kwalify (~> 0.7.0)
       parser (~> 3.0.0)
-      psych (~> 3.1)
+      psych (>= 3.1, < 5.0)
       rainbow (>= 2.0, < 4.0)
     regexp_parser (2.1.1)
     rexml (3.2.5)
@@ -76,16 +76,16 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.18.3)
+    rubocop (1.18.4)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 1.8.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.7.0)
+    rubocop-ast (1.9.0)
       parser (>= 3.0.1.1)
     rubocop-performance (1.11.4)
       rubocop (>= 1.7.0, < 2.0)
@@ -94,7 +94,7 @@ GEM
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
     ruby-progressbar (1.11.0)
-    ruby_parser (3.16.0)
+    ruby_parser (3.17.0)
       sexp_processor (~> 4.15, >= 4.15.1)
     sexp_processor (4.15.3)
     simplecov (0.17.1)
@@ -113,8 +113,8 @@ GEM
       unf_ext
     unf_ext (0.0.7.7)
     unicode-display_width (2.0.0)
-    webmock (3.13.0)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
 
@@ -122,7 +122,7 @@ PLATFORMS
   x86_64-darwin-20
 
 DEPENDENCIES
-  bundler (~> 2.2, >= 2.2.23)
+  bundler (~> 2.2, >= 2.2.25)
   bundler-audit (~> 0.8.0)
   dns_mock (~> 1.4)
   faker (~> 2.18)
@@ -131,15 +131,15 @@ DEPENDENCIES
   overcommit (~> 0.58.0)
   pry-byebug (~> 3.9)
   rake (~> 13.0, >= 13.0.6)
-  reek (~> 6.0, >= 6.0.4)
+  reek (~> 6.0, >= 6.0.5)
   rspec (~> 3.10)
-  rubocop (~> 1.18, >= 1.18.3)
+  rubocop (~> 1.18, >= 1.18.4)
   rubocop-performance (~> 1.11, >= 1.11.4)
   rubocop-rspec (~> 2.4)
   simplecov (~> 0.17.1)
   truemail!
   truemail-rspec (~> 0.6)
-  webmock (~> 3.13)
+  webmock (~> 3.14)
 
 BUNDLED WITH
-   2.2.23
+   2.2.25
diff --git a/lib/truemail/version.rb b/lib/truemail/version.rb
index 60c761f..95a666e 100644
--- a/lib/truemail/version.rb
+++ b/lib/truemail/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Truemail
-  VERSION = '2.4.6'
+  VERSION = '2.4.7'
 end
diff --git a/truemail.gemspec b/truemail.gemspec
index 39c46ea..8a92c65 100644
--- a/truemail.gemspec
+++ b/truemail.gemspec
@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'simpleidn', '~> 0.2.1'
 
-  spec.add_development_dependency 'bundler', '~> 2.2', '>= 2.2.23'
+  spec.add_development_dependency 'bundler', '~> 2.2', '>= 2.2.25'
   spec.add_development_dependency 'bundler-audit', '~> 0.8.0'
   spec.add_development_dependency 'dns_mock', '~> 1.4'
   spec.add_development_dependency 'faker', '~> 2.18'
@@ -42,12 +42,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'overcommit', '~> 0.58.0'
   spec.add_development_dependency 'pry-byebug', '~> 3.9'
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
-  spec.add_development_dependency 'reek', '~> 6.0', '>= 6.0.4'
+  spec.add_development_dependency 'reek', '~> 6.0', '>= 6.0.5'
   spec.add_development_dependency 'rspec', '~> 3.10'
-  spec.add_development_dependency 'rubocop', '~> 1.18', '>= 1.18.3'
+  spec.add_development_dependency 'rubocop', '~> 1.18', '>= 1.18.4'
   spec.add_development_dependency 'rubocop-performance', '~> 1.11', '>= 1.11.4'
   spec.add_development_dependency 'rubocop-rspec', '~> 2.4'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
   spec.add_development_dependency 'truemail-rspec', '~> 0.6'
-  spec.add_development_dependency 'webmock', '~> 3.13'
+  spec.add_development_dependency 'webmock', '~> 3.14'
 end