diff --git a/package-lock.json b/package-lock.json
index e97d2cef0..be0159606 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12232,15 +12232,16 @@
       }
     },
     "node_modules/glob": {
-      "version": "10.4.1",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz",
-      "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==",
+      "version": "10.4.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.2.tgz",
+      "integrity": "sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==",
       "dev": true,
       "dependencies": {
         "foreground-child": "^3.1.0",
         "jackspeak": "^3.1.2",
         "minimatch": "^9.0.4",
         "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
         "path-scurry": "^1.11.1"
       },
       "bin": {
@@ -17965,6 +17966,12 @@
         "node": ">=6"
       }
     },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
+      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+      "dev": true
+    },
     "node_modules/pacote": {
       "version": "17.0.6",
       "resolved": "https://registry.npmjs.org/pacote/-/pacote-17.0.6.tgz",
@@ -22228,9 +22235,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.17.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
-      "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
diff --git a/projects/table/src/declarations/interfaces/table-body-cell-context.interface.ts b/projects/table/src/declarations/interfaces/table-body-cell-context.interface.ts
index e5b4ebfa8..a5de1ada6 100644
--- a/projects/table/src/declarations/interfaces/table-body-cell-context.interface.ts
+++ b/projects/table/src/declarations/interfaces/table-body-cell-context.interface.ts
@@ -1,7 +1,7 @@
 import { TableBodyRowRef } from './table-body-row-ref.interface';
 import { TableColumnRef } from './table-column-ref.interface';
 
-export interface TableBodyCellContext<T> {
-  $implicit: TableBodyRowRef<T>;
-  column: TableColumnRef;
+export interface TableBodyCellContext<TCell, TColumn = unknown> {
+  $implicit: TableBodyRowRef<TCell>;
+  column: TableColumnRef<TColumn>;
 }
diff --git a/projects/table/src/declarations/interfaces/table-column-ref.interface.ts b/projects/table/src/declarations/interfaces/table-column-ref.interface.ts
index 9c32de279..e8745899b 100644
--- a/projects/table/src/declarations/interfaces/table-column-ref.interface.ts
+++ b/projects/table/src/declarations/interfaces/table-column-ref.interface.ts
@@ -3,9 +3,9 @@ import { Observable } from 'rxjs';
 import { TableColumnEvents } from '../events/table-column.events';
 import { TableColumnDefinition } from './table-column-definition.interface';
 
-export interface TableColumnRef {
+export interface TableColumnRef<TColumn = unknown> {
   readonly index: number;
-  readonly definition: TableColumnDefinition;
+  readonly definition: TableColumnDefinition<TColumn>;
   readonly widthPx$: Observable<number>;
   readonly isHovered$: Observable<boolean>;
   readonly isCurrentResizable$: Observable<boolean>;
diff --git a/projects/table/src/declarations/interfaces/table-header-cell-context.interface.ts b/projects/table/src/declarations/interfaces/table-header-cell-context.interface.ts
index d9cbf8118..dca4ceabc 100644
--- a/projects/table/src/declarations/interfaces/table-header-cell-context.interface.ts
+++ b/projects/table/src/declarations/interfaces/table-header-cell-context.interface.ts
@@ -1,6 +1,6 @@
 import { TableColumnRef } from './table-column-ref.interface';
 
-export interface TableHeaderCellContext {
-  $implicit: TableColumnRef;
+export interface TableHeaderCellContext<TColumn = unknown> {
+  $implicit: TableColumnRef<TColumn>;
   isDndClone: boolean;
 }
diff --git a/projects/table/src/directives/table-cell-template.directive.ts b/projects/table/src/directives/table-cell-template.directive.ts
index d69af8e42..eb1dd03c3 100644
--- a/projects/table/src/directives/table-cell-template.directive.ts
+++ b/projects/table/src/directives/table-cell-template.directive.ts
@@ -4,8 +4,16 @@ import { TableBodyCellContext } from '../declarations/interfaces/table-body-cell
 @Directive({
   selector: '[pupaTableBodyCellTemplate]',
 })
-export class TableBodyCellTemplateDirective<T> {
-  @Input() public pupaTableBodyCellTemplateTypeFrom: T;
+export class TableBodyCellTemplateDirective<TCell, TColumn> {
+  @Input() public pupaTableBodyCellTemplateCellTypeFrom: TCell;
+  @Input() public pupaTableBodyCellTemplateColumnTypeFrom: TColumn;
 
-  constructor(public readonly templateRef: TemplateRef<TableBodyCellContext<T>>) {}
+  constructor(public readonly templateRef: TemplateRef<TableBodyCellContext<TCell, TColumn>>) {}
+
+  public static ngTemplateContextGuard<TCell, TColumn>(
+    _directive: TableBodyCellTemplateDirective<TCell, TColumn>,
+    _context: unknown
+  ): _context is TableBodyCellContext<TCell, TColumn> {
+    return true;
+  }
 }
diff --git a/projects/widgets/src/components/infinity-scroller/directives/infinite-scroller-item-template.directive.ts b/projects/widgets/src/components/infinity-scroller/directives/infinite-scroller-item-template.directive.ts
index c7c7097da..59c18a3e6 100644
--- a/projects/widgets/src/components/infinity-scroller/directives/infinite-scroller-item-template.directive.ts
+++ b/projects/widgets/src/components/infinity-scroller/directives/infinite-scroller-item-template.directive.ts
@@ -8,4 +8,11 @@ export class InfiniteScrollerItemTemplateDirective<T> {
   @Input() public pupaInfiniteScrollerItemTemplateTypeFrom: T;
 
   constructor(public readonly templateRef: TemplateRef<InfinityScrollerItemContext<T>>) {}
+
+  public static ngTemplateContextGuard<T>(
+    _directive: InfiniteScrollerItemTemplateDirective<T>,
+    _context: unknown
+  ): _context is InfinityScrollerItemContext<T> {
+    return true;
+  }
 }