diff --git a/src/main/java/org/cactoos/package-info.java b/src/main/java/org/cactoos/package-info.java
index 599483520b..9aa38af262 100644
--- a/src/main/java/org/cactoos/package-info.java
+++ b/src/main/java/org/cactoos/package-info.java
@@ -35,5 +35,9 @@
  * @since 0.1
  * @see <a href="http://www.cactoos.org">Project site www.cactoos.org</a>
  * @see <a href="/yegor256/cactoos">GitHub repository</a>
+ * @todo #1445:30min For consistency sake with Func, let's
+ *  - introduce envelopes for Proc, BiProc, BiFunc, Runnable and Callable
+ *  - have FuncOf, ProcOf, etc extend their envelope to simplify their code
+ *  - apply on other classes that could benefit from it
  */
 package org.cactoos;
diff --git a/src/test/java/org/cactoos/experimental/TimedTest.java b/src/test/java/org/cactoos/experimental/TimedTest.java
index 06f518ddb9..6b4e6bc413 100644
--- a/src/test/java/org/cactoos/experimental/TimedTest.java
+++ b/src/test/java/org/cactoos/experimental/TimedTest.java
@@ -41,6 +41,9 @@
  * Test case for {@link Timed}.
  *
  * @since 1.0.0
+ * @todo #1445:30min Replace all the usage of Repeated in tests that
+ *  are used to execute the same test multiple times with the use of
+ *  the RepeatedTest annotation from Junit 5.
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  */
 final class TimedTest {