diff --git a/BaseReCaptcha.php b/BaseReCaptcha.php
deleted file mode 100644
index 1f0da14..0000000
--- a/BaseReCaptcha.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-namespace Denis303\ReCaptcha;
-
-use Exception;
-use Denis303\ReCaptcha\Config\ReCaptcha as ReCaptchaConfig;
-
-abstract class BaseReCaptcha extends \ReCaptcha\ReCaptcha
-{
-
-    protected $_lastResponse;
-
-    public function getLastResponse()
-    {
-        return $this->_lastResponse;
-    }
-
-    public function getLastErrors() : array
-    {
-        $return = $this->getLastErrorCodes();
-
-        foreach($return as $key => $value)
-        {
-            $return[$key] = lang('ReCaptcha.' . $value);
-        }
-
-        return $return;
-    }
-
-    public function getLastErrorCodes() : array
-    {
-        return $this->_lastResponse ? $this->_lastResponse->getErrorCodes() : [];
-    }
-
-    public function verify($response, $remoteIp = null)
-    {
-        if (!$remoteIp)
-        {
-            $ip = service('request')->getIPAddress();
-
-            if ($ip && ($ip != '0.0.0.0'))
-            {
-                $remoteIp = $ip;
-            }
-        }
-
-        $this->_lastResponse = parent::verify($response, $remoteIp);
-
-        return $this->_lastResponse;
-    }
-
-    public function render_v3(string $action, array $options = [])
-    {
-        $config = config(ReCaptchaConfig::class);
-
-        if (!$config->key)
-        {
-            throw new Exception('The key parameter is missing.');
-        }
-
-        return view('Denis303\ReCaptcha\Views\recaptcha3', [
-            'key' => $config->key,
-            'action' => $action,
-            'options' => $options
-        ]);
-    }
-
-}
\ No newline at end of file
diff --git a/BaseReCaptchaValidator.php b/BaseReCaptchaValidator.php
deleted file mode 100644
index c57c196..0000000
--- a/BaseReCaptchaValidator.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Denis303\ReCaptcha;
-
-use Denis303\ReCaptcha\Config\ReCaptcha as ReCaptchaConfig;
-
-abstract class BaseReCaptchaValidator
-{
-
-    public static function reCaptcha3(string $token, string $params) : bool
-    {
-        $reCaptcha = service('reCaptcha');
-
-        $params = explode(',', $params);
-
-        $reCaptcha->setExpectedAction(trim($params[0]));
-
-        if (count($params) > 1)
-        {
-            $reCaptcha->setScoreThreshold(trim($params[1]));
-        }
-        
-        $response = $reCaptcha->verify($token);
-
-        if (!$response->isSuccess())
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-}
\ No newline at end of file
diff --git a/Cells/ReCaptcha.php b/Cells/ReCaptcha.php
new file mode 100644
index 0000000..3c20011
--- /dev/null
+++ b/Cells/ReCaptcha.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Denis303\ReCaptcha\Cells;
+
+use Denis303\ReCaptcha\Config\ReCaptcha2;
+
+class ReCaptcha
+{
+
+    public function init_v2(array $params)
+    {
+        static $num = 0;
+
+        $num++;
+
+        $params['num'] = $num;
+
+        $config = config(ReCaptcha2::class);
+
+        assert($config ? true : false, ReCaptcha2::class);
+
+        $params['key'] = $config->key;
+
+        return view('Denis303\ReCaptcha\Views\init_v2', $params);
+    }
+
+    public function init_v3(array $params)
+    {
+        static $inited = [];
+
+        if (array_search($params['key'], $inited) === false)
+        {
+            $params['init'] = true;
+
+            $inited[] = $params['key'];
+        }
+        else
+        {
+            $params['init'] = false;
+        }
+
+        return view('Denis303\ReCaptcha\Views\init_v3', $params);
+    }
+    
+}
\ No newline at end of file
diff --git a/Config/BaseReCaptcha.php b/Config/BaseReCaptcha.php
deleted file mode 100644
index ffc7719..0000000
--- a/Config/BaseReCaptcha.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Denis303\ReCaptcha\Config;
-
-abstract class BaseReCaptcha extends \CodeIgniter\Config\BaseConfig
-{
-
-    public $key;
-
-    public $secret;
-
-    public $expectedHostname;
-
-    public $scoreThreshold = 0.5;
-
-    public $challengeTimeout;
-    
-}
\ No newline at end of file
diff --git a/Config/BaseServices.php b/Config/BaseServices.php
deleted file mode 100644
index 9fd2eaf..0000000
--- a/Config/BaseServices.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Denis303\ReCaptcha\Config;
-
-use Exception;
-use Denis303\ReCaptcha\ReCaptcha;
-use Denis303\ReCaptcha\Config\ReCaptcha as ReCaptchaConfig;
-
-abstract class BaseServices extends \CodeIgniter\Config\Services
-{
-
-    public static function reCaptcha($getShared = true)
-    {
-        if ($getShared)
-        {
-            return static::getSharedInstance(__FUNCTION__);
-        }
-
-        $config = config(ReCaptchaConfig::class);
-
-        if (!$config->secret)
-        {
-            throw new Exception('The secret parameter is missing.');
-        }
-
-        $return = new ReCaptcha($config->secret);
-
-        if ($config->scoreThreshold !== null)
-        {
-            $return->setScoreThreshold($config->scoreThreshold);
-        }
-
-        if ($config->expectedHostname !== null)
-        {
-            $return->setExpectedHostname($config->expectedHostname);
-        }
-
-        if ($config->challengeTimeout !== null)
-        {
-            $return->setChallengeTimeout($config->challengeTimeout);
-        }
-
-        return $return;
-    }
-
-}
\ No newline at end of file
diff --git a/Config/Events.php b/Config/Events.php
new file mode 100644
index 0000000..5fa9953
--- /dev/null
+++ b/Config/Events.php
@@ -0,0 +1,7 @@
+<?php
+
+use CodeIgniter\Events\Events;
+
+//Events::on('pre_system', function() {
+//    helper(['reCaptcha']);
+//});
\ No newline at end of file
diff --git a/Config/ReCaptcha.php b/Config/ReCaptcha.php
deleted file mode 100644
index 7da27ab..0000000
--- a/Config/ReCaptcha.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Denis303\ReCaptcha\Config;
-
-class ReCaptcha extends BaseReCaptcha
-{
-}
\ No newline at end of file
diff --git a/Config/ReCaptcha2.php b/Config/ReCaptcha2.php
new file mode 100644
index 0000000..028afd2
--- /dev/null
+++ b/Config/ReCaptcha2.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Denis303\ReCaptcha\Config;
+
+class ReCaptcha2 extends \CodeIgniter\Config\BaseConfig
+{
+
+    public $key;
+
+    public $secret;
+
+    public $expectedHostname;
+
+    public $challengeTimeout;    
+    
+}
\ No newline at end of file
diff --git a/Config/ReCaptcha3.php b/Config/ReCaptcha3.php
new file mode 100644
index 0000000..80e6a02
--- /dev/null
+++ b/Config/ReCaptcha3.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Denis303\ReCaptcha\Config;
+
+class ReCaptcha3 extends \CodeIgniter\Config\BaseConfig
+{
+
+    public $key;
+
+    public $secret;
+
+    public $expectedHostname;
+
+    public $scoreThreshold = 0.5;
+
+    public $challengeTimeout;
+    
+}
\ No newline at end of file
diff --git a/Config/Services.php b/Config/Services.php
index 17731c4..bfc8456 100644
--- a/Config/Services.php
+++ b/Config/Services.php
@@ -2,6 +2,83 @@
 
 namespace Denis303\ReCaptcha\Config;
 
-class Services extends BaseServices
+use Exception;
+use Denis303\ReCaptcha\Libraries\ReCaptcha;
+
+class Services extends \CodeIgniter\Config\Services
 {
+
+    public static function reCaptcha2($getShared = true)
+    {
+        if ($getShared)
+        {
+            return static::getSharedInstance(__FUNCTION__);
+        }
+
+        $config = config(ReCaptcha2::class);
+
+        if (!$config)
+        {
+            throw new Exception(ReCaptcha2::class . ' not found.');
+        }
+
+        if (!$config->secret)
+        {
+            throw new Exception('The secret parameter is missing.');
+        }
+
+        $return = new ReCaptcha($config->secret);
+
+        if ($config->expectedHostname !== null)
+        {
+            $return->setExpectedHostname($config->expectedHostname);
+        }
+
+        if ($config->challengeTimeout !== null)
+        {
+            $return->setChallengeTimeout($config->challengeTimeout);
+        }
+
+        return $return;
+    }
+
+    public static function reCaptcha3($getShared = true)
+    {
+        if ($getShared)
+        {
+            return static::getSharedInstance(__FUNCTION__);
+        }
+
+        $config = config(ReCaptcha3::class);
+
+        if (!$config)
+        {
+            throw new Exception(ReCaptcha3::class . ' not found.');
+        }
+
+        if (!$config->secret)
+        {
+            throw new Exception('The secret parameter is missing.');
+        }
+
+        $return = new ReCaptcha($config->secret);
+
+        if ($config->scoreThreshold !== null)
+        {
+            $return->setScoreThreshold($config->scoreThreshold);
+        }
+
+        if ($config->expectedHostname !== null)
+        {
+            $return->setExpectedHostname($config->expectedHostname);
+        }
+
+        if ($config->challengeTimeout !== null)
+        {
+            $return->setChallengeTimeout($config->challengeTimeout);
+        }
+
+        return $return;
+    }
+
 }
\ No newline at end of file
diff --git a/Helpers/form_recaptcha_helper.php b/Helpers/form_recaptcha_helper.php
deleted file mode 100644
index 294f20a..0000000
--- a/Helpers/form_recaptcha_helper.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if (!function_exists('form_recaptcha3'))
-{
-    function form_recaptcha3(string $action, array $options = [])
-    {
-        return service('reCaptcha')->render_v3($action, $options);
-    }
-}
\ No newline at end of file
diff --git a/Helpers/reCaptcha_helper.php b/Helpers/reCaptcha_helper.php
new file mode 100644
index 0000000..fb58c89
--- /dev/null
+++ b/Helpers/reCaptcha_helper.php
@@ -0,0 +1,79 @@
+<?php
+
+use Denis303\ReCaptcha\Config\ReCaptcha2;
+use Denis303\ReCaptcha\Config\ReCaptcha3;
+
+if (!function_exists('recaptcha2'))
+{
+    function recaptcha2(string $name, array $attributes = [], array $options = [], bool $init = true)
+    {
+        $config = config(ReCaptcha2::class);
+
+        if (!$config)
+        {
+            throw new Exception(ReCaptcha2::class . ' not found.');
+        }
+
+        if (empty($attributes['id']))
+        {
+            $attributes['id'] = $name;
+        }
+
+        helper('form');
+
+        $attributes['type'] = 'hidden';
+
+        $attributes['name'] = $name;
+
+        $return = form_input($attributes) . PHP_EOL;
+
+        if ($init)
+        {
+            $return .= view_cell('Denis303\ReCaptcha\Cells\ReCaptcha::init_v2', [
+                'key' => $config->key,
+                'id' => $attributes['id'],
+                'options' => $options
+            ]);
+        }
+
+        return $return;
+    }
+}
+
+if (!function_exists('recaptcha3'))
+{
+    function recaptcha3(string $name, array $attributes = [], array $options = [], bool $init = true)
+    {
+        $config = config(ReCaptcha3::class);
+
+        if (!$config)
+        {
+            throw new Exception(ReCaptcha3::class . ' not found.');
+        }
+
+        helper('form');
+
+        if (empty($attributes['id']))
+        {
+            $attributes['id'] = $name;
+        }
+
+        $attributes['type'] = 'hidden';
+
+        $attributes['name'] = $name;
+
+        $return = form_input($attributes) . PHP_EOL;
+
+        if ($init)
+        {
+            $return .= view_cell('Denis303\ReCaptcha\Cells\ReCaptcha::init_v3', [
+                'key' => $config->key,
+                'id' => $attributes['id'],
+                'options' => $options
+            ]);
+        }
+
+        return $return;
+    }
+    
+}
\ No newline at end of file
diff --git a/Language/en/Validation.php b/Language/en/Validation.php
deleted file mode 100644
index 28eae3f..0000000
--- a/Language/en/Validation.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'reCaptcha3' => 'ReCaptcha is not valid.'
-];
\ No newline at end of file
diff --git a/Libraries/ReCaptcha.php b/Libraries/ReCaptcha.php
new file mode 100644
index 0000000..7e447e4
--- /dev/null
+++ b/Libraries/ReCaptcha.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Denis303\ReCaptcha\Libraries;
+
+class ReCaptcha extends \ReCaptcha\ReCaptcha
+{
+
+    public function verify($response, $remoteIp = null)
+    {
+        if (!$remoteIp)
+        {
+            $ip = service('request')->getIPAddress();
+
+            if ($ip && ($ip != '0.0.0.0'))
+            {
+                $remoteIp = $ip;
+            }
+        }
+
+        return parent::verify($response, $remoteIp);
+    }
+    
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 7c6d259..3e73d61 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,83 @@
-# codeigniter4-recaptcha
\ No newline at end of file
+Google reCAPTCHA CodeIgniter 4 Library
+
+##Installation
+
+```composer require denis303/codeigniter4-recaptcha:dev-master```
+
+##Configuration
+
+In the .env file you need to add your personal ReCaptcha keys.
+
+```
+# --------------------------------------------------------------------
+# ReCaptcha 2
+# --------------------------------------------------------------------
+recaptcha2.key = 'XXXXXXXX-XXXXXXXX'
+recaptcha2.secret = 'XXXXXXXX-XXXXXXXX'
+
+# --------------------------------------------------------------------
+# ReCaptcha 3
+# --------------------------------------------------------------------
+recaptcha3.key = 'XXXXXXXX-XXXXXXXX'
+recaptcha3.secret = 'XXXXXXXX-XXXXXXXX'
+recaptcha3.scoreThreshold = 0.5
+```
+
+In the /app/Config/Validation.php file you need to add settings for validator:
+
+public $ruleSets = [
+    ...
+    \Denis303\ReCaptcha\Validation\ReCaptchaRules::class
+];
+
+## Rendering ReCaptcha 2
+
+Rendering of a hidden field ReCaptcha v2 in the form:
+
+```
+helper(['form', 'reCaptcha']);
+
+echo form_open();
+
+echo reCaptcha2('reCaptcha2', ['id' => 'recaptcha_1'], ['theme' => 'dark']);
+
+echo form_submit('submit', 'Submit');
+
+echo form_close();
+```
+
+## Rendering ReCaptcha 3
+
+Rendering of a hidden field ReCaptcha v3 in the form:
+
+```
+helper(['form', 'reCaptcha']);
+
+echo form_open();
+
+echo reCaptcha3('reCaptcha3', ['id' => 'recaptcha_1'], ['action' => 'contactForm']);
+
+echo form_submit('submit', 'Submit');
+
+echo form_close();
+```
+
+## Checking ReCaptcha in a model:
+
+public $validationRules = [
+    'reCaptcha2' => 'required|reCaptcha2[]'
+    'reCaptcha3' => 'required|reCaptcha3[contactForm,0.9]'
+    ....
+];
+
+In the settings of the reCaptcha3 validator, the first parameter you specify is expectedAction, this parameter is not required.
+
+You can override global scoreThreshold parameter in the second rule parameter.
+
+## Setting custom ReCaptcha validation error in a model:
+
+protected $validationMessages = [
+    'reCaptcha' => [
+        'reCaptcha3' => 'Captcha is not valid.'
+    ]
+];
\ No newline at end of file
diff --git a/ReCaptcha.php b/ReCaptcha.php
deleted file mode 100644
index 0638f4d..0000000
--- a/ReCaptcha.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Denis303\ReCaptcha;
-
-class ReCaptcha extends BaseReCaptcha
-{
-}
\ No newline at end of file
diff --git a/ReCaptchaValidator.php b/ReCaptchaValidator.php
deleted file mode 100644
index 3199845..0000000
--- a/ReCaptchaValidator.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Denis303\ReCaptcha;
-
-class ReCaptchaValidator extends BaseReCaptchaValidator
-{
-}
\ No newline at end of file
diff --git a/Validation/ReCaptchaRules.php b/Validation/ReCaptchaRules.php
new file mode 100644
index 0000000..17e679d
--- /dev/null
+++ b/Validation/ReCaptchaRules.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Denis303\ReCaptcha\Validation;
+
+use Exception;
+
+class ReCaptchaRules
+{
+
+    public function reCaptcha2(string $token, string $params, array $data, &$error = null)
+    {
+        $service = service('reCaptcha2');
+
+        $params = explode(',', $params);
+
+        if (count($params) == 0)
+        {
+            $service->setExpectedAction($params[0]);
+        }
+        
+        $response = $service->verify($token);
+
+        if ($response->isSuccess())
+        {
+            return true;
+        }
+
+        foreach($response->getErrorCodes() as $key => $value)
+        {
+            $error = lang('ReCaptcha.' . $value);
+        
+            break;
+        }
+
+        return false;
+    }
+
+    public function reCaptcha3(string $token, string $params, array $data, &$error = null)
+    {
+        $service = service('reCaptcha3');
+
+        $params = explode(',', $params);
+
+        if (count($params) > 0)
+        {
+            $service->setExpectedAction($params[0]);
+        }
+
+        if (count($params) > 1)
+        {
+            $service->setScoreThreshold($params[1]);
+        }
+        
+        $response = $service->verify($token);
+
+        if ($response->isSuccess())
+        {
+            return true;
+        }
+
+        foreach($response->getErrorCodes() as $key => $value)
+        {
+            $error = lang('ReCaptcha.' . $value);
+        
+            break;
+        }
+
+        return false;
+    }
+
+}
\ No newline at end of file
diff --git a/Views/init_v2.php b/Views/init_v2.php
new file mode 100644
index 0000000..7b1acf3
--- /dev/null
+++ b/Views/init_v2.php
@@ -0,0 +1,21 @@
+<?php
+
+$options['sitekey'] = $key;
+$options['callback'] = 'reCaptcha2VerifyCallback_' . $num;
+
+?>
+
+<div id="reCaptcha2_<?= $num;?>"></div>
+
+<script type="text/javascript">
+
+    var reCaptcha2VerifyCallback_<?= $num;?> = function(response) {
+        document.getElementById('<?= $id;?>').value = response;
+    };
+
+    var reCaptcha2Callback_<?= $num;?> = function() {
+        grecaptcha.render('reCaptcha2_<?= $num;?>', <?= json_encode($options);?>);
+    };
+</script>
+
+<script src="https://www.google.com/recaptcha/api.js?onload=reCaptcha2Callback_<?= $num;?>&render=explicit" async defer></script>
diff --git a/Views/init_v3.php b/Views/init_v3.php
new file mode 100644
index 0000000..edee83a
--- /dev/null
+++ b/Views/init_v3.php
@@ -0,0 +1,16 @@
+<?php if($init):?>
+
+<script type="text/javascript" src="https://www.google.com/recaptcha/api.js?render=<?= $key;?>"></script>
+
+<?php endif;?>
+
+<script type="text/javascript">
+
+grecaptcha.ready(function() {
+    grecaptcha.execute('<?= $key;?>', <?= json_encode($options);?>).then(function(token) {
+        document.getElementById('<?= $id;?>').value = token;
+        document.getElementById('<?= $id;?>').oninput();
+    });
+});
+
+</script>
\ No newline at end of file
diff --git a/Views/recaptcha3.php b/Views/recaptcha3.php
deleted file mode 100644
index 4e46748..0000000
--- a/Views/recaptcha3.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-$js_config = [];
-
-if ($action)
-{
-    $js_config['action'] = $action;
-}
-
-if (empty($options['id']))
-{
-    $options['id'] = 'reCaptcha';
-}
-
-if (empty($options['name']))
-{
-    $options['name'] = 'reCaptcha';
-}
-
-$options['type'] = 'hidden';
-
-helper('form');
-
-echo form_input($options);
-
-static $inited = false;
-
-if (!$inited)
-{
-    $inited = true;
-
-    echo '<script type="text/javascript" src="https://www.google.com/recaptcha/api.js?render=' . $key . '"></script>';
-}
-
-?>
-<script type="text/javascript">
-grecaptcha.ready(function() {
-    grecaptcha.execute('<?= $key;?>', <?= json_encode($js_config);?>).then(function(token) {
-        document.getElementById('<?= $options['id'];?>').value = token;
-        document.getElementById('<?= $options['id'];?>').oninput();
-    });
-});
-</script>
\ No newline at end of file