diff --git a/config/jsons/github-event.json b/config/jsons/github-events.json
similarity index 100%
rename from config/jsons/github-event.json
rename to config/jsons/github-events.json
diff --git a/config/jsons/gitlab-event.json b/config/jsons/gitlab-events.json
similarity index 100%
rename from config/jsons/gitlab-event.json
rename to config/jsons/gitlab-events.json
diff --git a/config/jsons/tg-setting.json b/config/jsons/tgn-settings.json
similarity index 100%
rename from config/jsons/tg-setting.json
rename to config/jsons/tgn-settings.json
diff --git a/config/tg-notifier.php b/config/tg-notifier.php
index 1021753..9127043 100644
--- a/config/tg-notifier.php
+++ b/config/tg-notifier.php
@@ -4,26 +4,53 @@
     'telegram-git-notifier' => [
         'app' => [
             'name'     => $_ENV['TGN_APP_NAME'] ?? 'Telegram Git Notifier',
+
+            // Required for the bot to work properly
             'url'      => $_ENV['TGN_APP_URL'] ?? 'http://localhost:3000',
+
             'timezone' => $_ENV['TIMEZONE'] ?? 'Asia/Ho_Chi_Minh',
         ],
 
         'bot' => [
             'token'           => $_ENV['TELEGRAM_BOT_TOKEN'] ?? '',
             'chat_id'         => $_ENV['TELEGRAM_BOT_CHAT_ID'] ?? '',
-            'notify_chat_ids' => explode(
-                ',',
-                $_ENV['TELEGRAM_NOTIFY_CHAT_IDS'] ?? ''
-            ),
+
+            /**
+             * Set the chat ids that will receive notifications
+             * You can add the owner bot id, group id, ...
+             * -------------------------------------------------------
+             * Note:
+             * Please use semicolon ";" to separate chat ids
+             * And use colon ":" to separate chat id and thread id
+             * And use comma "," if you want to add multiple thread ids
+             * -------------------------------------------------------
+             * The environment variable is expected to be in the format:
+             * "chat_id1;chat_id2:thread_id2;chat_id3:thread_id3_1,thread_id3_2;..."
+            */
+            'notify_chat_ids' => $_ENV['TELEGRAM_NOTIFY_CHAT_IDS'] ?? '',
         ],
 
         'author' => [
-            'discussion'     => $_ENV['TGN_AUTHOR_DISCUSSION'] ??
+            'discussion'  => $_ENV['TGN_AUTHOR_DISCUSSION'] ??
                 'https://github.com/lbiltech/telegram-git-notifier/discussions',
             'source_code' => $_ENV['TGN_AUTHOR_SOURCE_CODE'] ??
                 'https://github.com/lbiltech/telegram-git-notifier',
         ],
 
+        /** Set the path to the data file */
+        'data_file' => [
+            'setting'  => $_ENV['TGN_PATH_SETTING'] ??
+                'storage/json/tgn/tgn-settings.json',
+
+            'platform' => [
+                'gitlab' => $_ENV['TGN_PATH_PLATFORM_GITLAB'] ??
+                    'storage/json/tgn/gitlab-events.json',
+                'github' => $_ENV['TGN_PATH_PLATFORM_GITHUB'] ??
+                    'storage/json/tgn/github-events.json',
+            ],
+        ],
+
+        /** Set the path to the view file */
         'view' => [
             'path' => $_ENV['TGN_VIEW_PATH'] ??
                 'resources/views',
diff --git a/src/Bot.php b/src/Bot.php
new file mode 100644
index 0000000..445c98a
--- /dev/null
+++ b/src/Bot.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace LbilTech\TelegramGitNotifier;
+
+use LbilTech\TelegramGitNotifier\Constants\EventConstant;
+use LbilTech\TelegramGitNotifier\Interfaces\BotInterface;
+use LbilTech\TelegramGitNotifier\Interfaces\Structures\AppInterface;
+use LbilTech\TelegramGitNotifier\Interfaces\EventInterface;
+use LbilTech\TelegramGitNotifier\Models\Event;
+use LbilTech\TelegramGitNotifier\Models\Setting;
+use LbilTech\TelegramGitNotifier\Structures\App;
+use LbilTech\TelegramGitNotifier\Structures\TelegramBot;
+use LbilTech\TelegramGitNotifier\Trait\BotSettingTrait;
+use LbilTech\TelegramGitNotifier\Trait\EventSettingTrait;
+use LbilTech\TelegramGitNotifier\Trait\EventTrait;
+use Telegram;
+
+class Bot implements AppInterface, BotInterface, EventInterface
+{
+    use App;
+    use TelegramBot;
+
+    use EventTrait;
+    use BotSettingTrait;
+    use EventSettingTrait;
+
+    public Event $event;
+
+    public Setting $setting;
+
+    public function __construct(
+        Telegram $telegram = null,
+        ?string $chatBotId = null,
+        Setting $setting = null,
+        Event $event = null,
+        ?string $settingFile = null,
+        ?string $platform = EventConstant::DEFAULT_PLATFORM,
+        ?string $platformFile = null,
+    ) {
+        $this->telegram = $telegram ?? new Telegram(config('telegram-git-notifier.bot.token'));
+        $this->setCurrentChatBotId($chatBotId);
+        $this->event = $event ?? new Event();
+        $this->setPlatFormForEvent($platform, $platformFile);
+
+        $this->setting = $setting ?? new Setting();
+        $this->updateSetting($settingFile);
+    }
+}
diff --git a/src/Constants/EventConstant.php b/src/Constants/EventConstant.php
index 67e5ebe..94a54a2 100644
--- a/src/Constants/EventConstant.php
+++ b/src/Constants/EventConstant.php
@@ -2,7 +2,7 @@
 
 namespace LbilTech\TelegramGitNotifier\Constants;
 
-class EventConstant
+final class EventConstant
 {
     public const DEFAULT_PLATFORM = 'github';
 
diff --git a/src/Constants/NotificationConstant.php b/src/Constants/NotificationConstant.php
new file mode 100644
index 0000000..27d6df5
--- /dev/null
+++ b/src/Constants/NotificationConstant.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace LbilTech\TelegramGitNotifier\Constants;
+
+final class NotificationConstant
+{
+    // Separation between chat id pairs
+    public const CHAT_ID_PAIRS_SEPARATOR = ';';
+
+    // Separation between chat id and thread id
+    public const CHAT_THREAD_ID_SEPARATOR = ':';
+
+    // Separation between thread id
+    public const THREAD_ID_SEPARATOR = ',';
+}
diff --git a/src/Constants/SettingConstant.php b/src/Constants/SettingConstant.php
index 1346452..4b5e4a3 100644
--- a/src/Constants/SettingConstant.php
+++ b/src/Constants/SettingConstant.php
@@ -2,7 +2,7 @@
 
 namespace LbilTech\TelegramGitNotifier\Constants;
 
-class SettingConstant
+final class SettingConstant
 {
     public const SETTING_PREFIX = 'stg.';
 
diff --git a/src/Exceptions/CallbackException.php b/src/Exceptions/CallbackException.php
index 890f38d..f709bd4 100644
--- a/src/Exceptions/CallbackException.php
+++ b/src/Exceptions/CallbackException.php
@@ -2,17 +2,15 @@
 
 namespace LbilTech\TelegramGitNotifier\Exceptions;
 
-use Exception;
-
-class CallbackException extends Exception
+final class CallbackException extends TelegramGitNotifierException
 {
     public static function isEmpty(): self
     {
-        return new static('Callback is empty');
+        return new self('Callback is empty');
     }
 
     public static function invalid(): self
     {
-        return new static('Callback is invalid');
+        return new self('Callback is invalid');
     }
 }
diff --git a/src/Exceptions/EntryNotFoundException.php b/src/Exceptions/EntryNotFoundException.php
index 919f18e..2e20763 100644
--- a/src/Exceptions/EntryNotFoundException.php
+++ b/src/Exceptions/EntryNotFoundException.php
@@ -2,22 +2,20 @@
 
 namespace LbilTech\TelegramGitNotifier\Exceptions;
 
-use Exception;
-
-class EntryNotFoundException extends Exception
+final class EntryNotFoundException extends TelegramGitNotifierException
 {
     public static function fileNotFound(): self
     {
-        return new static('File not found');
+        return new self('File not found');
     }
 
     public static function configNotFound($config): self
     {
-        return new static("Config {$config} not found");
+        return new self("Config {$config} not found");
     }
 
     public static function viewNotFound($view): self
     {
-        return new static("View {$view} not found");
+        return new self("View {$view} not found");
     }
 }
diff --git a/src/Exceptions/InvalidViewTemplateException.php b/src/Exceptions/InvalidViewTemplateException.php
index af94850..0acddc2 100644
--- a/src/Exceptions/InvalidViewTemplateException.php
+++ b/src/Exceptions/InvalidViewTemplateException.php
@@ -2,10 +2,9 @@
 
 namespace LbilTech\TelegramGitNotifier\Exceptions;
 
-use Exception;
 use Throwable;
 
-class InvalidViewTemplateException extends Exception
+final class InvalidViewTemplateException extends TelegramGitNotifierException
 {
     public static function create(
         string $view,
diff --git a/src/Exceptions/MessageIsEmptyException.php b/src/Exceptions/MessageIsEmptyException.php
index 8fb3821..75d8cd6 100644
--- a/src/Exceptions/MessageIsEmptyException.php
+++ b/src/Exceptions/MessageIsEmptyException.php
@@ -2,9 +2,7 @@
 
 namespace LbilTech\TelegramGitNotifier\Exceptions;
 
-use Exception;
-
-class MessageIsEmptyException extends Exception
+final class MessageIsEmptyException extends TelegramGitNotifierException
 {
     public static function create(): self
     {
diff --git a/src/Exceptions/SendNotificationException.php b/src/Exceptions/SendNotificationException.php
index 0318486..55a6b9a 100644
--- a/src/Exceptions/SendNotificationException.php
+++ b/src/Exceptions/SendNotificationException.php
@@ -2,9 +2,7 @@
 
 namespace LbilTech\TelegramGitNotifier\Exceptions;
 
-use Exception;
-
-class SendNotificationException extends Exception
+final class SendNotificationException extends TelegramGitNotifierException
 {
     public static function create(): self
     {
diff --git a/src/Exceptions/TelegramGitNotifierException.php b/src/Exceptions/TelegramGitNotifierException.php
new file mode 100644
index 0000000..e9e0337
--- /dev/null
+++ b/src/Exceptions/TelegramGitNotifierException.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace LbilTech\TelegramGitNotifier\Exceptions;
+
+use Exception;
+
+class TelegramGitNotifierException extends Exception
+{
+    public static function isEmpty(): self
+    {
+        return new static('Telegram Git Notifier is empty');
+    }
+
+    public static function invalid(): self
+    {
+        return new static('Telegram Git Notifier is invalid');
+    }
+}
diff --git a/src/Interfaces/TelegramInterface.php b/src/Interfaces/BotInterface.php
similarity index 97%
rename from src/Interfaces/TelegramInterface.php
rename to src/Interfaces/BotInterface.php
index f6d95c4..8f9091d 100644
--- a/src/Interfaces/TelegramInterface.php
+++ b/src/Interfaces/BotInterface.php
@@ -4,7 +4,7 @@
 
 use LbilTech\TelegramGitNotifier\Exceptions\MessageIsEmptyException;
 
-interface TelegramInterface
+interface BotInterface
 {
     /**
      * Set the menu button for a telegram
diff --git a/src/Interfaces/EventInterface.php b/src/Interfaces/EventInterface.php
index 82c6028..846a260 100644
--- a/src/Interfaces/EventInterface.php
+++ b/src/Interfaces/EventInterface.php
@@ -2,30 +2,39 @@
 
 namespace LbilTech\TelegramGitNotifier\Interfaces;
 
+use LbilTech\TelegramGitNotifier\Trait\ActionEventTrait;
+use Symfony\Component\HttpFoundation\Request;
+
 interface EventInterface
 {
     /**
-     * Validate access event before send notify
+     * Get action name of event from payload data
      *
-     * @param string $platform Source code platform (GitHub, GitLab)
-     * @param string $event Event name (push, pull_request)
      * @param $payload
      *
-     * @return bool
+     * @return string
+     * @see ActionEventTrait::getActionOfEvent()
      */
-    public function validateAccessEvent(
-        string $platform,
-        string $event,
-        $payload
-    ): bool;
+    public function getActionOfEvent($payload): string;
 
     /**
-     * Get action name of event from payload data
+     * Set platform and platform file for event
      *
-     * @param $payload
+     * @param string $platform
+     * @param string|null $platformFile
      *
-     * @return string
-     * @see ActionEventTrait::getActionOfEvent()
+     * @return void
+     * @see EventTrait::setPlatFormForEvent()
      */
-    public function getActionOfEvent($payload): string;
+    public function setPlatFormForEvent(string $platform, string $platformFile = null): void;
+
+    /**
+     * Set event config and get event name
+     *
+     * @param Request $request
+     *
+     * @return string|null
+     * @see EventTrait::handleEventFromRequest()
+     */
+    public function handleEventFromRequest(Request $request): ?string;
 }
diff --git a/src/Interfaces/AppInterface.php b/src/Interfaces/Structures/AppInterface.php
similarity index 81%
rename from src/Interfaces/AppInterface.php
rename to src/Interfaces/Structures/AppInterface.php
index acb60bc..13f0786 100644
--- a/src/Interfaces/AppInterface.php
+++ b/src/Interfaces/Structures/AppInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LbilTech\TelegramGitNotifier\Interfaces;
+namespace LbilTech\TelegramGitNotifier\Interfaces\Structures;
 
 use LbilTech\TelegramGitNotifier\Exceptions\EntryNotFoundException;
 use LbilTech\TelegramGitNotifier\Exceptions\MessageIsEmptyException;
@@ -15,6 +15,7 @@ interface AppInterface
      *
      * @return void
      * @throws MessageIsEmptyException
+     * @see App::sendMessage()
      */
     public function sendMessage(
         string $message = '',
@@ -29,6 +30,7 @@ public function sendMessage(
      *
      * @return void
      * @throws EntryNotFoundException
+     * @see App::sendPhoto()
      */
     public function sendPhoto(string $photo = '', string $caption = ''): void;
 
@@ -39,6 +41,7 @@ public function sendPhoto(string $photo = '', string $caption = ''): void;
      *
      * @return void
      * @throws MessageIsEmptyException
+     * @see App::answerCallbackQuery()
      */
     public function answerCallbackQuery(string $text = null): void;
 
@@ -49,6 +52,7 @@ public function answerCallbackQuery(string $text = null): void;
      * @param array $options
      *
      * @return void
+     * @see App::editMessageText()
      */
     public function editMessageText(
         ?string $text = null,
@@ -61,6 +65,7 @@ public function editMessageText(
      * @param array $options
      *
      * @return void
+     * @see App::editMessageReplyMarkup()
      */
     public function editMessageReplyMarkup(array $options = []): void;
 
@@ -68,6 +73,7 @@ public function editMessageReplyMarkup(array $options = []): void;
      * Get the text from callback message
      *
      * @return string
+     * @see App::getCallbackTextMessage()
      */
     public function getCallbackTextMessage(): string;
 
@@ -77,6 +83,7 @@ public function getCallbackTextMessage(): string;
      * @param array $options
      *
      * @return array
+     * @see App::setCallbackContentMessage()
      */
     public function setCallbackContentMessage(array $options = []): array;
 
@@ -84,13 +91,15 @@ public function setCallbackContentMessage(array $options = []): array;
      * @param string $chatId
      *
      * @return void
+     * @see App::setCurrentChatBotId()
      */
-    public function setCurrentChatId(string $chatId): void;
+    public function setCurrentChatBotId(string $chatId): void;
 
     /**
      * Get the username of the bot
      *
      * @return string|null
+     * @see App::getBotName()
      */
     public function getBotName(): ?string;
 
@@ -98,6 +107,7 @@ public function getBotName(): ?string;
      * Get the command message from a telegram
      *
      * @return string
+     * @see App::getCommandMessage()
      */
     public function getCommandMessage(): string;
 }
diff --git a/src/Interfaces/NotificationInterface.php b/src/Interfaces/Structures/NotificationInterface.php
similarity index 68%
rename from src/Interfaces/NotificationInterface.php
rename to src/Interfaces/Structures/NotificationInterface.php
index 5f5c7b3..863f01f 100644
--- a/src/Interfaces/NotificationInterface.php
+++ b/src/Interfaces/Structures/NotificationInterface.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace LbilTech\TelegramGitNotifier\Interfaces;
+namespace LbilTech\TelegramGitNotifier\Interfaces\Structures;
 
 use LbilTech\TelegramGitNotifier\Exceptions\InvalidViewTemplateException;
 use LbilTech\TelegramGitNotifier\Exceptions\SendNotificationException;
-use LbilTech\TelegramGitNotifier\Services\TelegramService;
 use Symfony\Component\HttpFoundation\Request;
 
 interface NotificationInterface
@@ -12,15 +11,14 @@ interface NotificationInterface
     /**
      * Notify access denied to other chat ids
      *
-     * @param TelegramService $telegramService
      * @param string|null $viewTemplate
      * @param string|null $chatId
      *
      * @return void
      * @throws InvalidViewTemplateException
+     * @see Notification::accessDenied()
      */
     public function accessDenied(
-        TelegramService $telegramService,
         string $chatId = null,
         string $viewTemplate = null,
     ): void;
@@ -33,19 +31,21 @@ public function accessDenied(
      *
      * @return mixed|void
      * @throws InvalidViewTemplateException
+     * @see Notification::setPayload()
      */
     public function setPayload(Request $request, string $event);
 
     /**
      * Send notification to telegram
      *
-     * @param string $chatId
      * @param string|null $message
+     * @param array $options
      *
      * @return bool
      * @throws SendNotificationException
+     * @see Notification::sendNotify()
      */
-    public function sendNotify(string $chatId, string $message = null): bool;
+    public function sendNotify(string $message = null, array $options = []): bool;
 
     /**
      * Get action name of event from payload data
@@ -53,7 +53,14 @@ public function sendNotify(string $chatId, string $message = null): bool;
      * @param $payload
      *
      * @return string
-     * @see ActionEventTrait::getActionOfEvent()
+     * @see EventTrait::getActionOfEvent()
      */
     public function getActionOfEvent($payload): string;
+
+    /**
+     * Convert chat and thread ids to array
+     * Example: 1234567890;1234567890:thread1;1234567890:thread1,thread2
+     * @return array
+     */
+    public function parseNotifyChatIds(): array;
 }
diff --git a/src/Interfaces/SettingInterface.php b/src/Interfaces/Structures/SettingInterface.php
similarity index 98%
rename from src/Interfaces/SettingInterface.php
rename to src/Interfaces/Structures/SettingInterface.php
index f6e473c..d37ced3 100644
--- a/src/Interfaces/SettingInterface.php
+++ b/src/Interfaces/Structures/SettingInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LbilTech\TelegramGitNotifier\Interfaces;
+namespace LbilTech\TelegramGitNotifier\Interfaces\Structures;
 
 use LbilTech\TelegramGitNotifier\Constants\EventConstant;
 use LbilTech\TelegramGitNotifier\Exceptions\InvalidViewTemplateException;
diff --git a/src/Interfaces/WebhookInterface.php b/src/Interfaces/WebhookInterface.php
index c7c822a..d63e853 100644
--- a/src/Interfaces/WebhookInterface.php
+++ b/src/Interfaces/WebhookInterface.php
@@ -35,4 +35,18 @@ public function setWebhook(): false|string;
      * @return false|string
      */
     public function deleteWebHook(): false|string;
+
+    /**
+     * Get webhook info
+     *
+     * @return false|string
+     */
+    public function getWebHookInfo(): false|string;
+
+    /**
+     * Get webhook update
+     *
+     * @return false|string
+     */
+    public function getUpdates(): false|string;
 }
diff --git a/src/Models/Event.php b/src/Models/Event.php
index c223f56..a6a8287 100644
--- a/src/Models/Event.php
+++ b/src/Models/Event.php
@@ -6,7 +6,7 @@
 
 class Event
 {
-    public array $eventConfig = [];
+    private array $eventConfig = [];
 
     public string $platform = EventConstant::DEFAULT_PLATFORM;
 
@@ -30,6 +30,14 @@ public function setPlatformFile(string $platformFile): void
         $this->platformFile = $platformFile;
     }
 
+    /**
+     * @return array
+     */
+    public function getEventConfig(): array
+    {
+        return $this->eventConfig;
+    }
+
     /**
      * Set event config
      *
diff --git a/src/Models/Setting.php b/src/Models/Setting.php
index bce7fe8..6c07913 100644
--- a/src/Models/Setting.php
+++ b/src/Models/Setting.php
@@ -62,6 +62,8 @@ public function isAllEventsNotification(): bool
     }
 
     /**
+     * Condition for checking the notification status
+     *
      * @return bool
      */
     public function isNotified(): bool
@@ -83,7 +85,7 @@ public function isNotified(): bool
      *
      * @return bool
      */
-    public function updateSettingItem(
+    public function updateSetting(
         string $settingName,
         $settingValue = null
     ): bool {
diff --git a/src/Notifier.php b/src/Notifier.php
new file mode 100644
index 0000000..33d9a0c
--- /dev/null
+++ b/src/Notifier.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace LbilTech\TelegramGitNotifier;
+
+use GuzzleHttp\Client;
+use LbilTech\TelegramGitNotifier\Constants\EventConstant;
+use LbilTech\TelegramGitNotifier\Constants\NotificationConstant;
+use LbilTech\TelegramGitNotifier\Interfaces\Structures\AppInterface;
+use LbilTech\TelegramGitNotifier\Interfaces\EventInterface;
+use LbilTech\TelegramGitNotifier\Interfaces\Structures\NotificationInterface;
+use LbilTech\TelegramGitNotifier\Models\Event;
+use LbilTech\TelegramGitNotifier\Structures\App;
+use LbilTech\TelegramGitNotifier\Structures\Notification;
+use LbilTech\TelegramGitNotifier\Trait\EventTrait;
+use Telegram;
+
+class Notifier implements AppInterface, NotificationInterface, EventInterface
+{
+    use App;
+    use Notification;
+
+    use EventTrait;
+
+    public Event $event;
+
+    public Client $client;
+
+    public function __construct(
+        Telegram $telegram = null,
+        ?string $chatBotId = null,
+        Event $event = null,
+        ?string $platform = EventConstant::DEFAULT_PLATFORM,
+        ?string $platformFile = null,
+        Client $client = null,
+    ) {
+        $this->telegram = $telegram ?? new Telegram(config('telegram-git-notifier.bot.token'));
+        $this->setCurrentChatBotId($chatBotId);
+
+        $this->event = $event ?? new Event();
+        $this->setPlatFormForEvent($platform, $platformFile);
+
+        $this->client = $client ?? new Client();
+    }
+
+    public function parseNotifyChatIds(): array
+    {
+        $chatData = explode(
+            NotificationConstant::CHAT_ID_PAIRS_SEPARATOR,
+            config('telegram-git-notifier.bot.notify_chat_ids')
+        );
+        $chatThreadMapping = [];
+
+        foreach ($chatData as $data) {
+            [$chatId, $threadIds] = explode(NotificationConstant::CHAT_THREAD_ID_SEPARATOR, $data) + [null, null];
+            $chatThreadMapping[$chatId] = $threadIds
+                ? explode(NotificationConstant::THREAD_ID_SEPARATOR, $threadIds)
+                : [];
+        }
+        return $chatThreadMapping;
+    }
+}
diff --git a/src/Services/EventService.php b/src/Objects/Validator.php
similarity index 60%
rename from src/Services/EventService.php
rename to src/Objects/Validator.php
index 50e5bcf..944529d 100644
--- a/src/Services/EventService.php
+++ b/src/Objects/Validator.php
@@ -1,29 +1,35 @@
 <?php
 
-namespace LbilTech\TelegramGitNotifier\Services;
+namespace LbilTech\TelegramGitNotifier\Objects;
 
-use LbilTech\TelegramGitNotifier\Interfaces\EventInterface;
 use LbilTech\TelegramGitNotifier\Models\Event;
 use LbilTech\TelegramGitNotifier\Models\Setting;
 use LbilTech\TelegramGitNotifier\Trait\ActionEventTrait;
 
-class EventService implements EventInterface
+class Validator
 {
     use ActionEventTrait;
 
-    public Setting $setting;
+    private Setting $setting;
 
-    public Event $event;
+    private Event $event;
 
-    public function __construct(
-        Setting $setting,
-        Event $event
-    ) {
+    public function __construct(Setting $setting, Event $event)
+    {
         $this->setting = $setting;
         $this->event = $event;
     }
 
-    public function validateAccessEvent(
+    /**
+     * Validate is access event before send notify
+     *
+     * @param string $platform Source code platform (GitHub, GitLab)
+     * @param string $event Event name (push, pull_request)
+     * @param $payload
+     *
+     * @return bool
+     */
+    public function isAccessEvent(
         string $platform,
         string $event,
         $payload
@@ -35,11 +41,9 @@ public function validateAccessEvent(
         if ($this->setting->isAllEventsNotification()) {
             return true;
         }
-
         $this->event->setEventConfig($platform);
-        $eventConfig = $this->event->eventConfig;
 
-        $eventConfig = $eventConfig[tgn_convert_event_name($event)] ?? false;
+        $eventConfig = $this->event->getEventConfig()[tgn_convert_event_name($event)] ?? false;
         $action = $this->getActionOfEvent($payload);
 
         if (!empty($action) && isset($eventConfig[$action])) {
diff --git a/src/Services/SettingService.php b/src/Services/SettingService.php
deleted file mode 100644
index 4a1684d..0000000
--- a/src/Services/SettingService.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace LbilTech\TelegramGitNotifier\Services;
-
-use LbilTech\TelegramGitNotifier\Interfaces\SettingInterface;
-use LbilTech\TelegramGitNotifier\Models\Event;
-use LbilTech\TelegramGitNotifier\Models\Setting;
-use LbilTech\TelegramGitNotifier\Trait\BotSettingTrait;
-use LbilTech\TelegramGitNotifier\Trait\EventSettingTrait;
-use Telegram;
-
-class SettingService extends AppService implements SettingInterface
-{
-    use EventSettingTrait;
-    use BotSettingTrait;
-
-    public Setting $setting;
-
-    public Event $event;
-
-    public Telegram $telegram;
-
-    public function __construct(
-        Telegram $telegram,
-        Setting $setting,
-        Event $event,
-        ?string $chatId = null
-    ) {
-        parent::__construct($telegram);
-
-        $this->setting = $setting;
-        $this->event = $event;
-
-        $this->setCurrentChatId($chatId);
-    }
-}
diff --git a/src/Services/TelegramService.php b/src/Services/TelegramService.php
deleted file mode 100644
index 0b8d9c1..0000000
--- a/src/Services/TelegramService.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-namespace LbilTech\TelegramGitNotifier\Services;
-
-use LbilTech\TelegramGitNotifier\Interfaces\TelegramInterface;
-use Telegram;
-
-class TelegramService extends AppService implements TelegramInterface
-{
-    public Telegram $telegram;
-
-    public function __construct(
-        Telegram $telegram,
-        ?string $chatId = null
-    ) {
-        parent::__construct($telegram);
-        $this->setCurrentChatId($chatId);
-
-        $this->telegram = $telegram;
-    }
-
-    public function setMyCommands(
-        array $menuCommand,
-        ?string $view = null
-    ): void {
-        $this->telegram->setMyCommands([
-            'commands' => json_encode($menuCommand)
-        ]);
-        $this->sendMessage(
-            view(
-                $view ??
-                config('telegram-git-notifier.view.tools.set_menu_cmd')
-            )
-        );
-    }
-
-    public function isCallback(): bool
-    {
-        if ($this->telegram->getUpdateType() === Telegram::CALLBACK_QUERY) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function isMessage(): bool
-    {
-        if ($this->telegram->getUpdateType() === Telegram::MESSAGE) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function isOwner(): bool
-    {
-        if ($this->telegram->ChatID() == $this->chatId) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function isNotifyChat(): bool
-    {
-        $chatIds = config('telegram-git-notifier.bot.notify_chat_ids');
-        if (in_array($this->telegram->ChatID(), $chatIds)) {
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/src/Services/AppService.php b/src/Structures/App.php
similarity index 79%
rename from src/Services/AppService.php
rename to src/Structures/App.php
index 6a7f4a0..f3bf8c1 100644
--- a/src/Services/AppService.php
+++ b/src/Structures/App.php
@@ -1,33 +1,27 @@
 <?php
 
-namespace LbilTech\TelegramGitNotifier\Services;
+namespace LbilTech\TelegramGitNotifier\Structures;
 
 use Exception;
 use LbilTech\TelegramGitNotifier\Exceptions\EntryNotFoundException;
 use LbilTech\TelegramGitNotifier\Exceptions\MessageIsEmptyException;
-use LbilTech\TelegramGitNotifier\Interfaces\AppInterface;
 use Telegram;
 
-class AppService implements AppInterface
+trait App
 {
     public Telegram $telegram;
 
-    public string $chatId;
+    public string $chatBotId;
 
-    public function __construct(Telegram $telegram = null)
+    public function setCurrentChatBotId(string $chatBotId = null): void
     {
-        $this->telegram = $telegram ?? new Telegram(config('telegram-git-notifier.bot.token'));
+        $this->chatBotId = $chatBotId ?? config('telegram-git-notifier.bot.chat_id');
     }
 
-    public function setCurrentChatId(string $chatId = null): void
-    {
-        $this->chatId = $chatId ?? config('telegram-git-notifier.bot.chat_id');
-    }
-
-    private function createBaseContent(): array
+    private function createTelegramBaseContent(): array
     {
         return [
-            'chat_id'                  => $this->chatId,
+            'chat_id'                  => $this->chatBotId,
             'disable_web_page_preview' => true,
             'parse_mode'               => 'HTML'
         ];
@@ -39,15 +33,18 @@ public function sendMessage(string $message = '', array $options = []): void
             throw MessageIsEmptyException::create();
         }
 
-        $content = $this->createBaseContent();
+        $content = $this->createTelegramBaseContent();
         $content['text'] = $message;
 
         if (!empty($options['reply_markup'])) {
             $content['reply_markup'] = $this->telegram->buildInlineKeyBoard(
                 $options['reply_markup']
             );
+            unset($options['reply_markup']);
         }
 
+        $content = $content + $options;
+
         $this->telegram->sendMessage($content);
     }
 
@@ -57,25 +54,26 @@ public function sendPhoto(string $photo = '', string $caption = ''): void
             throw EntryNotFoundException::fileNotFound();
         }
 
-        $content = $this->createBaseContent();
+        $content = $this->createTelegramBaseContent();
         $content['photo'] = curl_file_create($photo);
         $content['caption'] = $caption;
 
         $this->telegram->sendPhoto($content);
     }
 
-    public function answerCallbackQuery(string $text = null): void
+    public function answerCallbackQuery(string $text = null, array $options = []): void
     {
         if (empty($text)) {
             throw MessageIsEmptyException::create();
         }
 
         try {
-            $this->telegram->answerCallbackQuery([
+            $options = array_merge([
                 'callback_query_id' => $this->telegram->Callback_ID(),
                 'text'              => $text,
                 'show_alert'        => true
-            ]);
+            ], $options);
+            $this->telegram->answerCallbackQuery($options);
         } catch (Exception $e) {
             error_log("Error answering callback query: " . $e->getMessage());
         }
diff --git a/src/Services/NotificationService.php b/src/Structures/Notification.php
similarity index 54%
rename from src/Services/NotificationService.php
rename to src/Structures/Notification.php
index dc85ef4..cfdbef3 100644
--- a/src/Services/NotificationService.php
+++ b/src/Structures/Notification.php
@@ -1,39 +1,24 @@
 <?php
 
-namespace LbilTech\TelegramGitNotifier\Services;
+namespace LbilTech\TelegramGitNotifier\Structures;
 
-use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
 use LbilTech\TelegramGitNotifier\Constants\EventConstant;
 use LbilTech\TelegramGitNotifier\Exceptions\SendNotificationException;
-use LbilTech\TelegramGitNotifier\Interfaces\NotificationInterface;
-use LbilTech\TelegramGitNotifier\Trait\ActionEventTrait;
 use Symfony\Component\HttpFoundation\Request;
 
-class NotificationService implements NotificationInterface
+trait Notification
 {
-    use ActionEventTrait;
-
     public mixed $payload;
 
     public string $message = '';
 
-    public string $platform = EventConstant::DEFAULT_PLATFORM;
-
-    public Client $client;
-
-    public function __construct(Client $client)
-    {
-        $this->client = $client;
-    }
-
     public function accessDenied(
-        TelegramService $telegramService,
         string $chatId = null,
         string $viewTemplate = null,
     ): void {
-        $telegramService->telegram->sendMessage([
-            'chat_id'                  => config('telegram-git-notifier.bot.chat_id'),
+        $this->telegram->sendMessage([
+            'chat_id'                  => $this->chatBotId,
             'text'                     => view(
                 $viewTemplate ?? config('telegram-git-notifier.view.globals.access_denied'),
                 ['chatId' => $chatId]
@@ -45,9 +30,9 @@ public function accessDenied(
 
     public function setPayload(Request $request, string $event)
     {
-        if ($this->platform === 'gitlab') {
+        if ($this->event->platform === 'gitlab') {
             $this->payload = json_decode($request->getContent());
-        } elseif ($this->platform === EventConstant::DEFAULT_PLATFORM) {
+        } elseif ($this->event->platform === EventConstant::DEFAULT_PLATFORM) {
             $this->payload = json_decode($request->request->get('payload'));
         }
         $this->setMessage($event);
@@ -68,8 +53,8 @@ private function setMessage(string $typeEvent): void
         $action = $this->getActionOfEvent($this->payload);
 
         $viewTemplate = empty($action)
-            ? "events.{$this->platform}.{$event}.default"
-            : "events.{$this->platform}.{$event}.{$action}";
+            ? "events.{$this->event->platform}.{$event}.default"
+            : "events.{$this->event->platform}.{$event}.{$action}";
 
         $this->message = view($viewTemplate, [
             'payload' => $this->payload,
@@ -77,25 +62,18 @@ private function setMessage(string $typeEvent): void
         ]);
     }
 
-    public function sendNotify(string $chatId, string $message = null): bool
+    public function sendNotify(string $message = null, array $options = []): bool
     {
-        if (!is_null($message)) {
-            $this->message = $message;
-        }
+        $this->message = !empty($message) ? $message : $this->message;
 
-        $queryParams = [
-            'chat_id'                  => $chatId,
-            'disable_web_page_preview' => 1,
-            'parse_mode'               => 'html',
-            'text'                     => $this->message
-        ];
+        $queryParams = array_merge($this->createTelegramBaseContent(), ['text' => $this->message], $options);
 
-        $url = 'https://api.telegram.org/bot'
-            . config('telegram-git-notifier.bot.token') . '/sendMessage'
-            . '?' . http_build_query($queryParams);
+        $url = 'https://api.telegram.org/bot' . config('telegram-git-notifier.bot.token') . '/sendMessage';
 
         try {
-            $response = $this->client->request('GET', $url);
+            $response = $this->client->request('POST', $url, [
+                'form_params' => $queryParams
+            ]);
 
             if ($response->getStatusCode() === 200) {
                 return true;
diff --git a/src/Structures/TelegramBot.php b/src/Structures/TelegramBot.php
new file mode 100644
index 0000000..af865dd
--- /dev/null
+++ b/src/Structures/TelegramBot.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace LbilTech\TelegramGitNotifier\Structures;
+
+use Telegram;
+
+trait TelegramBot
+{
+    public function isCallback(): bool
+    {
+        return $this->telegram->getUpdateType() === Telegram::CALLBACK_QUERY;
+    }
+
+    public function isMessage(): bool
+    {
+        return $this->telegram->getUpdateType() === Telegram::MESSAGE;
+    }
+
+    public function isOwner(): bool
+    {
+        return $this->telegram->ChatID() == $this->chatBotId;
+    }
+
+    public function isNotifyChat(): bool
+    {
+        $chatIds = config('telegram-git-notifier.bot.notify_chat_ids');
+        if (in_array($this->telegram->ChatID(), $chatIds)) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/src/Trait/BotSettingTrait.php b/src/Trait/BotSettingTrait.php
index 3d2593f..ef0ad2d 100644
--- a/src/Trait/BotSettingTrait.php
+++ b/src/Trait/BotSettingTrait.php
@@ -6,6 +6,31 @@
 
 trait BotSettingTrait
 {
+    public function updateSetting(?string $settingFile = null): void
+    {
+        if ($this->setting->getSettingFile()) {
+            return;
+        }
+        $settingFile = $settingFile ?? config('telegram-git-notifier.data_file.setting');
+        $this->setting->setSettingFile($settingFile);
+        $this->setting->setSettingConfig();
+    }
+
+    public function setMyCommands(
+        array $menuCommand,
+        ?string $view = null
+    ): void {
+        $this->telegram->setMyCommands([
+            'commands' => json_encode($menuCommand)
+        ]);
+        $this->sendMessage(
+            view(
+                $view ??
+                config('telegram-git-notifier.view.tools.set_menu_cmd')
+            )
+        );
+    }
+
     public function settingHandle(?string $view = null): void
     {
         $this->sendMessage(
diff --git a/src/Trait/EventSettingTrait.php b/src/Trait/EventSettingTrait.php
index 369766d..7e4f7fa 100644
--- a/src/Trait/EventSettingTrait.php
+++ b/src/Trait/EventSettingTrait.php
@@ -14,8 +14,8 @@ public function eventMarkup(
         $replyMarkup = $replyMarkupItem = [];
 
         $this->event->setEventConfig($platform);
-        $events = $parentEvent === null ? $this->event->eventConfig
-            : $this->event->eventConfig[$parentEvent];
+        $events = $parentEvent === null ? $this->event->getEventConfig()
+            : $this->event->getEventConfig()[$parentEvent];
 
         foreach ($events as $key => $value) {
             if (count($replyMarkupItem) === SettingConstant::BTN_LINE_ITEM_COUNT) {
diff --git a/src/Trait/EventTrait.php b/src/Trait/EventTrait.php
new file mode 100644
index 0000000..b29c157
--- /dev/null
+++ b/src/Trait/EventTrait.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace LbilTech\TelegramGitNotifier\Trait;
+
+use Symfony\Component\HttpFoundation\Request;
+use LbilTech\TelegramGitNotifier\Constants\EventConstant;
+
+trait EventTrait
+{
+    use ActionEventTrait;
+
+    public function setPlatFormForEvent(string $platform, string $platformFile = null): void
+    {
+        if (!$this->event->getPlatformFile()) {
+            /** @var array $platformFileDefaults */
+            $platformFileDefaults = config('telegram-git-notifier.data_file.platform');
+            $this->event->setPlatformFile($platformFile ?? $platformFileDefaults[$platform]);
+        }
+        $this->event->setEventConfig($platform);
+    }
+
+    public function handleEventFromRequest(Request $request): ?string
+    {
+        foreach (EventConstant::WEBHOOK_EVENT_HEADER as $platform => $header) {
+            $event = $request->server->get($header);
+            if (!is_null($event)) {
+                $this->event->platform = $platform;
+                $this->setPlatFormForEvent($platform);
+
+                return $event;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/src/Services/WebhookService.php b/src/Webhook.php
similarity index 60%
rename from src/Services/WebhookService.php
rename to src/Webhook.php
index bc7d75f..1fa81a1 100644
--- a/src/Services/WebhookService.php
+++ b/src/Webhook.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace LbilTech\TelegramGitNotifier\Services;
+namespace LbilTech\TelegramGitNotifier;
 
 use LbilTech\TelegramGitNotifier\Interfaces\WebhookInterface;
 
-class WebhookService implements WebhookInterface
+class Webhook implements WebhookInterface
 {
     private string $token;
 
@@ -33,4 +33,18 @@ public function deleteWebHook(): false|string
 
         return file_get_contents($url);
     }
+
+    public function getWebHookInfo(): false|string
+    {
+        $url = "https://api.telegram.org/bot{$this->token}/getWebhookInfo";
+
+        return file_get_contents($url);
+    }
+
+    public function getUpdates(): false|string
+    {
+        $url = "https://api.telegram.org/bot{$this->token}/getUpdates";
+
+        return file_get_contents($url);
+    }
 }