diff --git a/src/Interfaces/IAvailableContainer.ts b/src/Interfaces/IAvailableContainer.ts
index a4067e3..4b2e8c4 100644
--- a/src/Interfaces/IAvailableContainer.ts
+++ b/src/Interfaces/IAvailableContainer.ts
@@ -22,12 +22,14 @@ export interface IAvailableContainer {
   /** orientation */
   Orientation?: Orientation
 
+  // TODO: Refactor x, y in IPoint interface
   /** horizontal offset */
   X?: number
 
   /** vertical offset */
   Y?: number
 
+  // TODO: Refactor width, height, minWidth... in ISize interface
   /** width */
   Width?: number
 
@@ -57,6 +59,7 @@ export interface IAvailableContainer {
   /** margin */
   Margin?: IMargin
 
+  // TODO: Refactor isAnchor, isFlex in IBehaviors interface
   /** true if anchor, false otherwise */
   IsAnchor?: boolean
 
@@ -110,6 +113,7 @@ export interface IAvailableContainer {
    */
   Pattern?: string
 
+  // TODO: Refactor showSelf., showChildren., markPosition, showDimensionWithMarks in IDimensionOptions interface
   /** Hide the children in the treeview */
   HideChildrenInTreeview?: boolean
 
diff --git a/src/Interfaces/IContainerProperties.ts b/src/Interfaces/IContainerProperties.ts
index 35b1db7..6d7d7ba 100644
--- a/src/Interfaces/IContainerProperties.ts
+++ b/src/Interfaces/IContainerProperties.ts
@@ -27,6 +27,7 @@ export interface IContainerProperties {
   /** orientation */
   orientation: Orientation
 
+  // TODO: Refactor x, y in IPoint interface
   /** horizontal offset */
   x: number
 
@@ -36,6 +37,7 @@ export interface IContainerProperties {
   /** margin */
   margin: IMargin
 
+  // TODO: Refactor width, height, minWidth... in ISize interface
   /** width */
   width: number
 
@@ -62,6 +64,7 @@ export interface IContainerProperties {
    */
   maxHeight: number
 
+  // TODO: Refactor isAnchor, isFlex in IBehaviors interface
   /** true if anchor, false otherwise */
   isAnchor: boolean
 
@@ -71,9 +74,11 @@ export interface IContainerProperties {
   /** Horizontal alignment, also determines the visual location of x {Left = 0, Center, Right } */
   positionReference: PositionReference
 
+  // TODO: Refactor hideChildrenInTreeview in IUserInterface interface
   /** Hide the children in the treeview */
   hideChildrenInTreeview: boolean
 
+  // TODO: Refactor showSelf., showChildren., markPosition, showDimensionWithMarks in IDimensionOptions interface
   /** if true, show the dimension of the container */
   showSelfDimensions: Position[]