diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
index e6e8f46..d27f8a1 100644
--- a/.github/workflows/continuous-integration-workflow.yml
+++ b/.github/workflows/continuous-integration-workflow.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
-        python-version: ['3.7', '3.8', '3.9']
+        python-version: ['3.7', '3.8', '3.9', '3.10']
 
     steps:
       - uses: actions/checkout@v2
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ee239b5..277c4b8 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -32,11 +32,12 @@ repos:
     rev: v2.31.0
     hooks:
     -   id: pyupgrade
-        args: [--py36-plus]
+        args: [--py37-plus]
 -   repo: https://github.com/asottile/reorder_python_imports
     rev: v2.7.1
     hooks:
     -   id: reorder-python-imports
+        args: [--py37-plus, --add-import, 'from __future__ import annotations']
 -   repo: https://github.com/asottile/setup-cfg-fmt
     rev: v1.20.0
     hooks:
diff --git a/CHANGES.rst b/CHANGES.rst
index 9478ac9..8ced206 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,6 +7,13 @@ all releases are available on `PyPI <https://pypi.org/project/pytask-stata>`_ an
 `Anaconda.org <https://anaconda.org/conda-forge/pytask-stata>`_.
 
 
+0.1.1 - 2022-02-07
+------------------
+
+- :gh:`16` skips concurrent CI builds.
+- :gh:`17` deprecates Python 3.6 and adds support for Python 3.10.
+
+
 0.1.0 - 2021-07-21
 ------------------
 
diff --git a/setup.py b/setup.py
index 26e08e4..c21a9ee 100644
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from setuptools import setup
 
 
diff --git a/src/pytask_stata/__init__.py b/src/pytask_stata/__init__.py
index 165802c..f493641 100644
--- a/src/pytask_stata/__init__.py
+++ b/src/pytask_stata/__init__.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 try:
     from ._version import version as __version__
 except ImportError:
diff --git a/src/pytask_stata/cli.py b/src/pytask_stata/cli.py
index f7a1878..5ceda23 100644
--- a/src/pytask_stata/cli.py
+++ b/src/pytask_stata/cli.py
@@ -1,4 +1,6 @@
 """Everything related to the CLI."""
+from __future__ import annotations
+
 import click
 from _pytask.config import hookimpl
 
diff --git a/src/pytask_stata/collect.py b/src/pytask_stata/collect.py
index 5ae5b7a..337f1a1 100644
--- a/src/pytask_stata/collect.py
+++ b/src/pytask_stata/collect.py
@@ -1,11 +1,11 @@
 """Collect tasks."""
+from __future__ import annotations
+
 import copy
 import functools
 import subprocess
 from typing import Iterable
-from typing import Optional
 from typing import Sequence
-from typing import Union
 
 from _pytask.config import hookimpl
 from _pytask.mark_utils import get_specific_markers_from_task
@@ -17,7 +17,7 @@
 from pytask_stata.shared import get_node_from_dictionary
 
 
-def stata(options: Optional[Union[str, Iterable[str]]] = None):
+def stata(options: str | Iterable[str] | None = None):
     """Specify command line options for Stata.
 
     Parameters
diff --git a/src/pytask_stata/config.py b/src/pytask_stata/config.py
index 44a57e3..cbc5935 100644
--- a/src/pytask_stata/config.py
+++ b/src/pytask_stata/config.py
@@ -1,4 +1,6 @@
 """Configure pytask."""
+from __future__ import annotations
+
 import shutil
 import sys
 
diff --git a/src/pytask_stata/execute.py b/src/pytask_stata/execute.py
index 0fc84bb..cf7ebb7 100644
--- a/src/pytask_stata/execute.py
+++ b/src/pytask_stata/execute.py
@@ -1,4 +1,6 @@
 """Execute tasks."""
+from __future__ import annotations
+
 import re
 
 from _pytask.config import hookimpl
diff --git a/src/pytask_stata/parametrize.py b/src/pytask_stata/parametrize.py
index 8494ac3..6d73abd 100644
--- a/src/pytask_stata/parametrize.py
+++ b/src/pytask_stata/parametrize.py
@@ -1,4 +1,6 @@
 """Parametrize tasks."""
+from __future__ import annotations
+
 from _pytask.config import hookimpl
 from _pytask.mark import MARK_GEN as mark  # noqa: N811
 
diff --git a/src/pytask_stata/plugin.py b/src/pytask_stata/plugin.py
index c3d7ab7..686e412 100644
--- a/src/pytask_stata/plugin.py
+++ b/src/pytask_stata/plugin.py
@@ -1,4 +1,6 @@
 """Register hook specifications and implementations."""
+from __future__ import annotations
+
 from _pytask.config import hookimpl
 from pytask_stata import cli
 from pytask_stata import collect
diff --git a/src/pytask_stata/shared.py b/src/pytask_stata/shared.py
index 2272904..49ef00e 100644
--- a/src/pytask_stata/shared.py
+++ b/src/pytask_stata/shared.py
@@ -1,4 +1,6 @@
 """Shared functions and variables."""
+from __future__ import annotations
+
 import sys
 
 
diff --git a/tests/conftest.py b/tests/conftest.py
index 364aedf..2cb9a8c 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import shutil
 
 import pytest
diff --git a/tests/test_collect.py b/tests/test_collect.py
index 0343936..e0920b3 100644
--- a/tests/test_collect.py
+++ b/tests/test_collect.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from contextlib import ExitStack as does_not_raise  # noqa: N813
 from pathlib import Path
 
diff --git a/tests/test_config.py b/tests/test_config.py
index 1121c10..19d9be7 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 from pytask import main
 from pytask_stata.config import _nonnegative_nonzero_integer
diff --git a/tests/test_execute.py b/tests/test_execute.py
index 163f7b5..2d8025d 100644
--- a/tests/test_execute.py
+++ b/tests/test_execute.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import sys
 import textwrap
 from contextlib import ExitStack as does_not_raise  # noqa: N813
diff --git a/tests/test_normal_execution_w_plugin.py b/tests/test_normal_execution_w_plugin.py
index 7e06201..ee19252 100644
--- a/tests/test_normal_execution_w_plugin.py
+++ b/tests/test_normal_execution_w_plugin.py
@@ -1,4 +1,6 @@
 """Contains tests which do not require the plugin and ensure normal execution."""
+from __future__ import annotations
+
 import textwrap
 
 import pytest
diff --git a/tests/test_parallel.py b/tests/test_parallel.py
index f3212b1..5344b53 100644
--- a/tests/test_parallel.py
+++ b/tests/test_parallel.py
@@ -1,4 +1,6 @@
 """Contains test which ensure that the plugin works with pytask-parallel."""
+from __future__ import annotations
+
 import textwrap
 import time
 
diff --git a/tests/test_parametrize.py b/tests/test_parametrize.py
index 27dab52..ca34019 100644
--- a/tests/test_parametrize.py
+++ b/tests/test_parametrize.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import sys
 import textwrap