diff --git a/projects/dashboards/src/widgets/repeat/property-types/model-template-type.ts b/projects/dashboards/src/properties/property-types/model-template-type.ts
similarity index 100%
rename from projects/dashboards/src/widgets/repeat/property-types/model-template-type.ts
rename to projects/dashboards/src/properties/property-types/model-template-type.ts
diff --git a/projects/dashboards/src/public-api.ts b/projects/dashboards/src/public-api.ts
index 44f824559..efb661a26 100644
--- a/projects/dashboards/src/public-api.ts
+++ b/projects/dashboards/src/public-api.ts
@@ -7,7 +7,7 @@ export * from './properties/primitives/string-property-editor.component';
export * from './properties/dashboard-properties.module';
// Repeat
-export { ModelTemplatePropertyType } from './widgets/repeat/property-types/model-template-type';
+export { ModelTemplatePropertyType } from './properties/property-types/model-template-type';
export * from './persistence/dashboard-persistence.service';
export * from './widgets/widget-renderer';
diff --git a/projects/dashboards/src/widgets/conditional/conditional-widget-renderer.component.ts b/projects/dashboards/src/widgets/conditional/conditional-widget-renderer.component.ts
new file mode 100644
index 000000000..356be516a
--- /dev/null
+++ b/projects/dashboards/src/widgets/conditional/conditional-widget-renderer.component.ts
@@ -0,0 +1,22 @@
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { Renderer } from '@hypertrace/hyperdash';
+import { Observable } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
+import { WidgetRenderer } from '../widget-renderer';
+import { ConditionalModel } from './conditional.model';
+
+@Renderer({ modelClass: ConditionalModel })
+@Component({
+ selector: 'ht-conditional-widget',
+ changeDetection: ChangeDetectionStrategy.OnPush,
+ template: ` `
+})
+export class ConditionalWidgetRendererComponent extends WidgetRenderer {
+ public getChildModel(): Observable