diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..ef8a23c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,68 @@
+---
+name: Bug report
+about: Create a report to help us improve localtuya
+title: ''
+labels: 'bug'
+assignees: ''
+
+---
+<!-- READ THIS FIRST:
+  - For a new device, first check if you can find a similar device in the https://github.com/rospogrigio/localtuya/wiki/Known-working-and-non-working-devices
+  - Try to update to latest master version, your problem may be already fixed.
+  - Do not report issues for already existing problems. Check that an issue is not already opened and enrich it.
+  - Provide as many details as possible. Paste logs, configuration samples and code into the backticks.
+-->
+## The problem
+<!-- 
+  Describe the issue you are experiencing here to communicate to the
+  maintainers. Tell us what you were trying to do and what happened.
+-->
+
+
+## Environment
+<!--
+  Provide details about your environment.
+-->
+- Localtuya version: <!-- plugin version from HACS, master, commit id --> 
+- Last working localtuya version (if known and relevant): 
+- Home Assistant Core version: <!-- Configuration => Info --> 
+- [] Are you using the Home Assistant Tuya Cloud component ? <!-- if yes, put a x between the two [] => [x] -->
+- [] Are you using the Tuya App in parallel ? <!-- if yes, put a x between the two [] => [x] -->
+
+## Steps to reproduce
+<!--
+  Clearly define how to reproduce the issue. 
+-->
+1.
+2. 
+3.
+
+## Configuration `configuration.yaml` or `config_flow`
+<!--
+  Fill this with the yaml or config_flow configuration of the failing device. Even if it seems unimportant to you. 
+  Remove personal information and local key.
+-->
+```yaml
+
+```
+
+## DP dump
+<!-- 
+  Paste here a DP dump, see https://github.com/rospogrigio/localtuya/wiki/HOWTO-get-a-DPs-dump
+  You can also try to qualify your device using the procedure described https://github.com/rospogrigio/localtuya/wiki/Qualifying-a-device
+-->
+
+## Provide Home Assistant taceback/logs
+<!--
+  Provide traces if they are relevant. If the problem is reproducible, try to set the log level to debug for this component at least:
+  In Dev Tools => Services:
+
+  logger.set_level
+  custom_components.localtuya: debug
+
+-->
+```txt
+
+```
+## Additional information
+<!-- Put here any information that you think it may be relevant -->
diff --git a/custom_components/localtuya/light.py b/custom_components/localtuya/light.py
index d0d7c67..49fade8 100644
--- a/custom_components/localtuya/light.py
+++ b/custom_components/localtuya/light.py
@@ -273,7 +273,7 @@ class LocaltuyaLight(LocalTuyaEntity, LightEntity):
 
     def __find_scene_by_scene_data(self, data):
         return next(
-            (item for item in self._effect_list if self._scenes[item] == data),
+            (item for item in self._effect_list if self._scenes.get(item) == data),
             SCENE_CUSTOM,
         )
 
diff --git a/custom_components/localtuya/manifest.json b/custom_components/localtuya/manifest.json
index 094b987..7f19f9f 100644
--- a/custom_components/localtuya/manifest.json
+++ b/custom_components/localtuya/manifest.json
@@ -9,5 +9,6 @@
   ],
   "issue_tracker": "https://github.com/rospogrigio/localtuya/issues",
   "requirements": [],
-  "config_flow": true
+  "config_flow": true,
+  "iot_class": "local_push"
 }
diff --git a/requirements_test.txt b/requirements_test.txt
index aa65ae9..df62e77 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,9 +1,9 @@
-black==20.8b1
+black==21.4b0
 codespell==2.0.0
-flake8==3.8.4
-mypy==0.812
-pydocstyle==5.1.1
+flake8==3.9.2
+mypy==0.901
+pydocstyle==6.1.1
 cryptography==3.2
-pylint==2.7.2
+pylint==2.8.2
 pylint-strict-informational==0.1
 homeassistant==2021.1.4