diff --git a/active-record/src/main/java/com/iluwatar/activerecord/RecordBase.java b/active-record/src/main/java/com/iluwatar/activerecord/RecordBase.java
index bdecf260c226..cd6e83765231 100644
--- a/active-record/src/main/java/com/iluwatar/activerecord/RecordBase.java
+++ b/active-record/src/main/java/com/iluwatar/activerecord/RecordBase.java
@@ -60,6 +60,8 @@ protected Connection getConnection() {
   protected abstract String getTableName();
 
   /**
+   * TODO: An INSERT statement has to be constructed based on the fields
+   *  and not hardcoded in the domain models themselves.
    * Constructs an INSERT query which is being used for an insertion purposes.
    *
    * @return an insertion query.