diff --git a/src/Interfaces/TelegramInterface.php b/src/Interfaces/TelegramInterface.php
index c1dad9f..4776b77 100644
--- a/src/Interfaces/TelegramInterface.php
+++ b/src/Interfaces/TelegramInterface.php
@@ -26,4 +26,11 @@ public function setMyCommands(
      * @return bool
      */
     public function isCallback(): bool;
+
+    /**
+     * Check message or command from a telegram
+     *
+     * @return bool
+     */
+    public function isMessage(): bool;
 }
diff --git a/src/Services/SettingService.php b/src/Services/SettingService.php
index b05b3c5..b48955d 100644
--- a/src/Services/SettingService.php
+++ b/src/Services/SettingService.php
@@ -2,15 +2,18 @@
 
 namespace LbilTech\TelegramGitNotifier\Services;
 
-use LbilTech\TelegramGitNotifier\Constants\EventConstant;
-use LbilTech\TelegramGitNotifier\Constants\SettingConstant;
 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;
@@ -27,287 +30,4 @@ public function __construct(
         $this->setting = $setting;
         $this->event = $event;
     }
-
-    public function eventMarkup(
-        ?string $parentEvent = null,
-        string $platform = EventConstant::DEFAULT_PLATFORM
-    ): array {
-        $replyMarkup = $replyMarkupItem = [];
-
-        $this->event->setEventConfig($platform);
-        $events = $parentEvent === null ? $this->event->eventConfig
-            : $this->event->eventConfig[$parentEvent];
-
-        foreach ($events as $key => $value) {
-            if (count($replyMarkupItem)
-                === SettingConstant::BTN_LINE_ITEM_COUNT
-            ) {
-                $replyMarkup[] = $replyMarkupItem;
-                $replyMarkupItem = [];
-            }
-
-            $callbackData = $this->getCallbackData(
-                $key,
-                $platform,
-                $value,
-                $parentEvent
-            );
-            $eventName = $this->getEventName($key, $value);
-
-            $replyMarkupItem[] = $this->telegram->buildInlineKeyBoardButton(
-                $eventName,
-                '',
-                $callbackData
-            );
-        }
-
-        if (count($replyMarkupItem) > 0) {
-            $replyMarkup[] = $replyMarkupItem;
-        }
-
-        $replyMarkup[] = $this->getEndKeyboard($platform, $parentEvent);
-
-        return $replyMarkup;
-    }
-
-    public function getCallbackData(
-        string $event,
-        string $platform,
-        array|bool $value = false,
-        ?string $parentEvent = null
-    ): string {
-        $platformSeparator = $platform === EventConstant::DEFAULT_PLATFORM
-            ? EventConstant::GITHUB_EVENT_SEPARATOR
-            : EventConstant::GITLAB_EVENT_SEPARATOR;
-        $prefix = EventConstant::EVENT_PREFIX . $platformSeparator;
-
-        if (is_array($value)) {
-            return $prefix . EventConstant::EVENT_HAS_ACTION_SEPARATOR . $event;
-        } elseif ($parentEvent) {
-            return $prefix . $parentEvent . '.' . $event
-                . EventConstant::EVENT_UPDATE_SEPARATOR;
-        }
-
-        return $prefix . $event . EventConstant::EVENT_UPDATE_SEPARATOR;
-    }
-
-    public function getEventName(string $event, $value): string
-    {
-        if (is_array($value)) {
-            return '⚙ ' . $event;
-        } elseif ($value) {
-            return '✅ ' . $event;
-        }
-
-        return '❌ ' . $event;
-    }
-
-    public function getEndKeyboard(
-        string $platform,
-        ?string $parentEvent = null
-    ): array {
-        $back = SettingConstant::SETTING_BACK_TO_SETTINGS_MENU;
-
-        if ($parentEvent) {
-            $back = SettingConstant::SETTING_BACK_TO_EVENTS_MENU
-                . $platform;
-        }
-
-        return [
-            $this->telegram->buildInlineKeyBoardButton('🔙 Back', '', $back),
-            $this->telegram->buildInlineKeyBoardButton(
-                '📚 Menu',
-                '',
-                SettingConstant::SETTING_BACK_TO_MAIN_MENU
-            )
-        ];
-    }
-
-    public function eventHandle(
-        ?string $callback = null,
-        ?string $platform = null
-    ): void {
-        $platform = $this->getPlatformFromCallback($callback, $platform);
-
-        if ($this->sendSettingEventMessage($platform, $callback)) {
-            return;
-        }
-
-        $event = $this->getEventFromCallback($callback);
-
-        if ($this->handleEventWithActions($event, $platform)) {
-            return;
-        }
-
-        $this->handleEventUpdate($event, $platform);
-    }
-
-    public function getPlatformFromCallback(
-        ?string $callback,
-        ?string $platform
-    ): string {
-        if ($platform) {
-            return $platform;
-        }
-
-        if (str_contains($callback, EventConstant::GITHUB_EVENT_SEPARATOR)) {
-            return 'github';
-        } elseif (
-            str_contains(
-                $callback,
-                EventConstant::GITLAB_EVENT_SEPARATOR
-            )
-        ) {
-            return 'gitlab';
-        }
-
-        return EventConstant::DEFAULT_PLATFORM;
-    }
-
-    public function sendSettingEventMessage(
-        string $platform,
-        ?string $callback = null,
-        ?string $view = null
-    ): bool {
-        if (SettingConstant::SETTING_GITHUB_EVENTS === $callback
-            || SettingConstant::SETTING_GITLAB_EVENTS === $callback
-            || !$callback
-        ) {
-            $this->editMessageText(
-                view(
-                    $view ??
-                    config('telegram-git-notifier.view.tools.custom_event'),
-                    compact('platform')
-                ),
-                ['reply_markup' => $this->eventMarkup(null, $platform)]
-            );
-            return true;
-        }
-
-        return false;
-    }
-
-    public function getEventFromCallback(?string $callback): string
-    {
-        return str_replace([
-            EventConstant::EVENT_PREFIX,
-            EventConstant::GITHUB_EVENT_SEPARATOR,
-            EventConstant::GITLAB_EVENT_SEPARATOR
-        ], '', $callback);
-    }
-
-    public function handleEventWithActions(
-        string $event,
-        string $platform,
-        ?string $view = null
-    ): bool {
-        if (str_contains($event, EventConstant::EVENT_HAS_ACTION_SEPARATOR)) {
-            $event = str_replace(
-                EventConstant::EVENT_HAS_ACTION_SEPARATOR,
-                '',
-                $event
-            );
-            $this->editMessageText(
-                view(
-                    $view ?? config('telegram-git-notifier.view.tools.custom_event_action'),
-                    compact('event', 'platform')
-                ),
-                ['reply_markup' => $this->eventMarkup($event, $platform)]
-            );
-            return true;
-        }
-
-        return false;
-    }
-
-    public function handleEventUpdate(string $event, string $platform): void
-    {
-        if (str_contains($event, EventConstant::EVENT_UPDATE_SEPARATOR)) {
-            $event = str_replace(
-                EventConstant::EVENT_UPDATE_SEPARATOR,
-                '',
-                $event
-            );
-            $this->eventUpdateHandle($event, $platform);
-        }
-    }
-
-    public function eventUpdateHandle(string $event, string $platform): void
-    {
-        [$event, $action] = explode('.', $event);
-
-        $this->event->setEventConfig($platform);
-        $this->event->updateEvent($event, $action);
-        $this->eventHandle(
-            $action
-                ? EventConstant::PLATFORM_EVENT_SEPARATOR[$platform]
-                . EventConstant::EVENT_HAS_ACTION_SEPARATOR . $event
-                : null,
-            $platform
-        );
-    }
-
-    public function settingHandle(?string $view = null): void
-    {
-        $this->sendMessage(
-            view($view ?? config('telegram-git-notifier.view.tools.setting')),
-            ['reply_markup' => $this->settingMarkup()]
-        );
-    }
-
-    public function settingMarkup(): array
-    {
-        $markup = [
-            [
-                $this->telegram->buildInlineKeyBoardButton(
-                    $this->setting[SettingConstant::T_IS_NOTIFIED]
-                        ? '✅ Allow notifications'
-                        : 'Allow notifications',
-                    '',
-                    SettingConstant::SETTING_IS_NOTIFIED
-                ),
-            ],
-            [
-                $this->telegram->buildInlineKeyBoardButton(
-                    $this->setting[SettingConstant::T_ALL_EVENTS_NOTIFICATION]
-                        ? '✅ Enable All Events Notify'
-                        : 'Enable All Events Notify',
-                    '',
-                    SettingConstant::SETTING_ALL_EVENTS_NOTIFY
-                ),
-            ]
-        ];
-
-        $markup = $this->customEventMarkup($markup);
-
-        $markup[] = [
-            $this->telegram->buildInlineKeyBoardButton(
-                '🔙 Back to menu',
-                '',
-                SettingConstant::SETTING_BACK . 'menu'
-            ),
-        ];
-
-        return $markup;
-    }
-
-    public function customEventMarkup(array $markup): array
-    {
-        if (!$this->setting[SettingConstant::T_ALL_EVENTS_NOTIFICATION]) {
-            $markup[] = [
-                $this->telegram->buildInlineKeyBoardButton(
-                    '🦑 Custom github events',
-                    '',
-                    SettingConstant::SETTING_GITHUB_EVENTS
-                ),
-                $this->telegram->buildInlineKeyBoardButton(
-                    '🦊 Custom gitlab events',
-                    '',
-                    SettingConstant::SETTING_GITLAB_EVENTS
-                ),
-            ];
-        }
-
-        return $markup;
-    }
 }
diff --git a/src/Services/TelegramService.php b/src/Services/TelegramService.php
index 6530b72..3f137b9 100644
--- a/src/Services/TelegramService.php
+++ b/src/Services/TelegramService.php
@@ -32,9 +32,16 @@ public function setMyCommands(
 
     public function isCallback(): bool
     {
-        if (!is_null($this->telegram->getData())
-            && !is_null($this->telegram->Callback_ChatID())
-        ) {
+        if ($this->telegram->getUpdateType() === Telegram::CALLBACK_QUERY) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function isMessage(): bool
+    {
+        if ($this->telegram->getUpdateType() === Telegram::MESSAGE) {
             return true;
         }
 
diff --git a/src/Trait/BotSettingTrait.php b/src/Trait/BotSettingTrait.php
new file mode 100644
index 0000000..e41dc0c
--- /dev/null
+++ b/src/Trait/BotSettingTrait.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace LbilTech\TelegramGitNotifier\Trait;
+
+use LbilTech\TelegramGitNotifier\Constants\SettingConstant;
+
+trait BotSettingTrait
+{
+    public function settingHandle(?string $view = null): void
+    {
+        $this->sendMessage(
+            view($view ?? config('telegram-git-notifier.view.tools.setting')),
+            ['reply_markup' => $this->settingMarkup()]
+        );
+    }
+
+    public function settingMarkup(): array
+    {
+        $markup = [
+            [
+                $this->telegram->buildInlineKeyBoardButton(
+                    $this->setting[SettingConstant::T_IS_NOTIFIED]
+                        ? '✅ Allow notifications'
+                        : 'Allow notifications',
+                    '',
+                    SettingConstant::SETTING_IS_NOTIFIED
+                ),
+            ],
+            [
+                $this->telegram->buildInlineKeyBoardButton(
+                    $this->setting[SettingConstant::T_ALL_EVENTS_NOTIFICATION]
+                        ? '✅ Enable All Events Notify'
+                        : 'Enable All Events Notify',
+                    '',
+                    SettingConstant::SETTING_ALL_EVENTS_NOTIFY
+                ),
+            ]
+        ];
+
+        $markup = $this->customEventMarkup($markup);
+
+        $markup[] = [
+            $this->telegram->buildInlineKeyBoardButton(
+                '🔙 Back to menu',
+                '',
+                SettingConstant::SETTING_BACK . 'menu'
+            ),
+        ];
+
+        return $markup;
+    }
+
+    public function customEventMarkup(array $markup): array
+    {
+        if (!$this->setting[SettingConstant::T_ALL_EVENTS_NOTIFICATION]) {
+            $markup[] = [
+                $this->telegram->buildInlineKeyBoardButton(
+                    '🦑 Custom github events',
+                    '',
+                    SettingConstant::SETTING_GITHUB_EVENTS
+                ),
+                $this->telegram->buildInlineKeyBoardButton(
+                    '🦊 Custom gitlab events',
+                    '',
+                    SettingConstant::SETTING_GITLAB_EVENTS
+                ),
+            ];
+        }
+
+        return $markup;
+    }
+}
diff --git a/src/Trait/EventSettingTrait.php b/src/Trait/EventSettingTrait.php
new file mode 100644
index 0000000..7815eb7
--- /dev/null
+++ b/src/Trait/EventSettingTrait.php
@@ -0,0 +1,220 @@
+<?php
+
+namespace LbilTech\TelegramGitNotifier\Trait;
+
+use LbilTech\TelegramGitNotifier\Constants\EventConstant;
+use LbilTech\TelegramGitNotifier\Constants\SettingConstant;
+
+trait EventSettingTrait
+{
+    public function eventMarkup(
+        ?string $parentEvent = null,
+        string $platform = EventConstant::DEFAULT_PLATFORM
+    ): array {
+        $replyMarkup = $replyMarkupItem = [];
+
+        $this->event->setEventConfig($platform);
+        $events = $parentEvent === null ? $this->event->eventConfig
+            : $this->event->eventConfig[$parentEvent];
+
+        foreach ($events as $key => $value) {
+            if (count($replyMarkupItem) === SettingConstant::BTN_LINE_ITEM_COUNT) {
+                $replyMarkup[] = $replyMarkupItem;
+                $replyMarkupItem = [];
+            }
+
+            $callbackData = $this->getCallbackData(
+                $key,
+                $platform,
+                $value,
+                $parentEvent
+            );
+            $eventName = $this->getEventName($key, $value);
+
+            $replyMarkupItem[] = $this->telegram->buildInlineKeyBoardButton(
+                $eventName,
+                '',
+                $callbackData
+            );
+        }
+
+        if (count($replyMarkupItem) > 0) {
+            $replyMarkup[] = $replyMarkupItem;
+        }
+
+        $replyMarkup[] = $this->getEndKeyboard($platform, $parentEvent);
+
+        return $replyMarkup;
+    }
+
+    public function getCallbackData(
+        string $event,
+        string $platform,
+        array|bool $value = false,
+        ?string $parentEvent = null
+    ): string {
+        $platformSeparator = $platform === EventConstant::DEFAULT_PLATFORM
+            ? EventConstant::GITHUB_EVENT_SEPARATOR
+            : EventConstant::GITLAB_EVENT_SEPARATOR;
+        $prefix = EventConstant::EVENT_PREFIX . $platformSeparator;
+
+        if (is_array($value)) {
+            return $prefix . EventConstant::EVENT_HAS_ACTION_SEPARATOR . $event;
+        } elseif ($parentEvent) {
+            return $prefix . $parentEvent . '.' . $event
+                . EventConstant::EVENT_UPDATE_SEPARATOR;
+        }
+
+        return $prefix . $event . EventConstant::EVENT_UPDATE_SEPARATOR;
+    }
+
+    public function getEventName(string $event, $value): string
+    {
+        if (is_array($value)) {
+            return '⚙ ' . $event;
+        } elseif ($value) {
+            return '✅ ' . $event;
+        }
+
+        return '❌ ' . $event;
+    }
+
+    public function getEndKeyboard(
+        string $platform,
+        ?string $parentEvent = null
+    ): array {
+        $back = SettingConstant::SETTING_BACK_TO_SETTINGS_MENU;
+
+        if ($parentEvent) {
+            $back = SettingConstant::SETTING_BACK_TO_EVENTS_MENU
+                . $platform;
+        }
+
+        return [
+            $this->telegram->buildInlineKeyBoardButton('🔙 Back', '', $back),
+            $this->telegram->buildInlineKeyBoardButton(
+                '📚 Menu',
+                '',
+                SettingConstant::SETTING_BACK_TO_MAIN_MENU
+            )
+        ];
+    }
+
+    public function eventHandle(
+        ?string $callback = null,
+        ?string $platform = null
+    ): void {
+        $platform = $this->getPlatformFromCallback($callback, $platform);
+
+        if ($this->sendSettingEventMessage($platform, $callback)) {
+            return;
+        }
+
+        $event = $this->getEventFromCallback($callback);
+
+        if ($this->handleEventWithActions($event, $platform)) {
+            return;
+        }
+
+        $this->handleEventUpdate($event, $platform);
+    }
+
+    public function getPlatformFromCallback(
+        ?string $callback,
+        ?string $platform
+    ): string {
+        if ($platform) {
+            return $platform;
+        }
+
+        if (str_contains($callback, EventConstant::GITHUB_EVENT_SEPARATOR)) {
+            return 'github';
+        } elseif (str_contains($callback, EventConstant::GITLAB_EVENT_SEPARATOR)) {
+            return 'gitlab';
+        }
+
+        return EventConstant::DEFAULT_PLATFORM;
+    }
+
+    public function sendSettingEventMessage(
+        string $platform,
+        ?string $callback = null,
+        ?string $view = null
+    ): bool {
+        if (SettingConstant::SETTING_GITHUB_EVENTS === $callback
+            || SettingConstant::SETTING_GITLAB_EVENTS === $callback
+            || !$callback
+        ) {
+            $this->editMessageText(
+                view(
+                    $view ?? config('telegram-git-notifier.view.tools.custom_event'),
+                    compact('platform')
+                ),
+                ['reply_markup' => $this->eventMarkup(null, $platform)]
+            );
+            return true;
+        }
+
+        return false;
+    }
+
+    public function getEventFromCallback(?string $callback): string
+    {
+        return str_replace([
+            EventConstant::EVENT_PREFIX,
+            EventConstant::GITHUB_EVENT_SEPARATOR,
+            EventConstant::GITLAB_EVENT_SEPARATOR
+        ], '', $callback);
+    }
+
+    public function handleEventWithActions(
+        string $event,
+        string $platform,
+        ?string $view = null
+    ): bool {
+        if (str_contains($event, EventConstant::EVENT_HAS_ACTION_SEPARATOR)) {
+            $event = str_replace(
+                EventConstant::EVENT_HAS_ACTION_SEPARATOR,
+                '',
+                $event
+            );
+            $this->editMessageText(
+                view(
+                    $view ?? config('telegram-git-notifier.view.tools.custom_event_action'),
+                    compact('event', 'platform')
+                ),
+                ['reply_markup' => $this->eventMarkup($event, $platform)]
+            );
+            return true;
+        }
+
+        return false;
+    }
+
+    public function handleEventUpdate(string $event, string $platform): void
+    {
+        if (str_contains($event, EventConstant::EVENT_UPDATE_SEPARATOR)) {
+            $event = str_replace(
+                EventConstant::EVENT_UPDATE_SEPARATOR,
+                '',
+                $event
+            );
+            $this->eventUpdateHandle($event, $platform);
+        }
+    }
+
+    public function eventUpdateHandle(string $event, string $platform): void
+    {
+        [$event, $action] = explode('.', $event);
+
+        $this->event->setEventConfig($platform);
+        $this->event->updateEvent($event, $action);
+        $this->eventHandle(
+            $action
+                ? EventConstant::PLATFORM_EVENT_SEPARATOR[$platform]
+                . EventConstant::EVENT_HAS_ACTION_SEPARATOR . $event
+                : null,
+            $platform
+        );
+    }
+}