diff --git a/src/SelfServe/Decorators.tsx b/src/SelfServe/Decorators.tsx
index 7420849a6..15529a7e0 100644
--- a/src/SelfServe/Decorators.tsx
+++ b/src/SelfServe/Decorators.tsx
@@ -8,8 +8,7 @@ import {
   Info,
   NumberUiType,
   OnChangeCallback,
-  RefreshParams,
-  SelfServeBaseClass
+  RefreshParams
 } from "./SelfServeTypes";
 import { addPropertyToMap, buildSmartUiDescriptor, DecoratorProperties, SelfServeType } from "./SelfServeUtils";
 
@@ -136,13 +135,10 @@ const isDescriptionDisplayOptions = (inputOptions: InputOptions): inputOptions i
 };
 
 const addToMap = (...decorators: Decorator[]): PropertyDecorator => {
+  console.log(decorators)
   return async (target, property) => {
     console.log("--------------------------------------")
-    console.log(target);
-    console.log(target instanceof SelfServeBaseClass)
-    console.log(target.constructor.name)
-    console.log(target.constructor.toString())
-    console.log(target.constructor.prototype)
+    console.log(property);
     // console.log((target as SelfServeBaseClass))
     // console.log((target as SelfServeBaseClass).test)
     // console.log((target as MaterializedViewsBuilder))
@@ -154,6 +150,7 @@ const addToMap = (...decorators: Decorator[]): PropertyDecorator => {
       className = target.constructor.name;
     }
     const propertyName = property.toString();
+    console.log(propertyName)
     if (className === "Function") {
       //eslint-disable-next-line @typescript-eslint/ban-types
       className = (target as Function).name;
@@ -161,6 +158,7 @@ const addToMap = (...decorators: Decorator[]): PropertyDecorator => {
     }
 
     const propertyType = (Reflect.getMetadata("design:type", target, property)?.name as string)?.toLowerCase();
+    console.log(propertyType)
     addPropertyToMap(target, propertyName, className, "type", propertyType);
     addPropertyToMap(target, propertyName, className, "dataFieldName", propertyName);
 
@@ -238,7 +236,14 @@ export const IsDisplayable = (): ClassDecorator => {
  * how often the auto refresh of the page occurs.
  */
 export const RefreshOptions = (refreshParams: RefreshParams): ClassDecorator => {
+  console.log(refreshParams)
   return (target) => {
-    addPropertyToMap(target.prototype, "root", target.name, "refreshParams", refreshParams);
+    let targetName: string;
+    if (target.constructor.toString().includes(SelfServeType.materializedviewsbuilder)) {
+      targetName = SelfServeType.materializedviewsbuilder;
+    } else if (target instanceof Function) {
+      targetName = target.constructor.name;
+    }
+    addPropertyToMap(target.prototype, "root", targetName, "refreshParams", refreshParams);
   };
 };
diff --git a/src/SelfServe/SelfServeUtils.tsx b/src/SelfServe/SelfServeUtils.tsx
index ef4cb614c..e6c8194ef 100644
--- a/src/SelfServe/SelfServeUtils.tsx
+++ b/src/SelfServe/SelfServeUtils.tsx
@@ -141,6 +141,9 @@ export const updateContextWithDecorator = <T extends keyof DecoratorProperties,
   descriptorName: keyof DecoratorProperties,
   descriptorValue: K,
 ): void => {
+  console.log(context)
+  console.log(propertyName)
+  console.log(className)
   if (!(context instanceof Map)) {
     throw new Error(`@IsDisplayable should be the first decorator for the class '${className}'.`);
   }