diff --git a/masking/snowflake/describe/udf.sql b/masking/snowflake/describe/udf.sql
new file mode 100644
index 0000000..4bd7232
--- /dev/null
+++ b/masking/snowflake/describe/udf.sql
@@ -0,0 +1,6 @@
+SELECT SPLIT_PART(f.comment, '\n', 1) AS "Function Name",
+       SPLIT_PART(f.comment, '\n', 2) AS "Version",
+       SPLIT_PART(f.comment, '\n', 3) AS "Created at",
+       SPLIT_PART(f.comment, '\n', 4) AS "Source Code"
+FROM ${DB}.information_schema.functions AS f
+WHERE f.function_schema = '${SCHEMA}' AND f.function_name = '${FUNC_NAME}';
diff --git a/masking/snowflake/udf.sql b/masking/snowflake/install/udf.sql
similarity index 83%
rename from masking/snowflake/udf.sql
rename to masking/snowflake/install/udf.sql
index ee8a366..fb7ecc5 100644
--- a/masking/snowflake/udf.sql
+++ b/masking/snowflake/install/udf.sql
@@ -1,4 +1,10 @@
-CREATE OR REPLACE FUNCTION %s.CyralMask(mask_spec array, columns array)
+CREATE DATABASE IF NOT EXISTS ${DB};
+GRANT USAGE ON DATABASE ${DB} TO PUBLIC;
+
+CREATE SCHEMA IF NOT EXISTS ${DB}.${SCHEMA};
+GRANT USAGE ON SCHEMA ${DB}.${SCHEMA} TO PUBLIC;
+
+CREATE OR REPLACE FUNCTION ${DB}.${SCHEMA}.${FUNC_NAME}(mask_spec array, columns array)
   RETURNS TABLE (masked_columns array)
   LANGUAGE JAVASCRIPT
   AS '{
@@ -49,26 +55,26 @@ CREATE OR REPLACE FUNCTION %s.CyralMask(mask_spec array, columns array)
             var str = [...Array(len)].map(_=>(Math.random()*10|0).toString(10)).join``;
             return parseInt(str);
           }
-          // We do not support the data type so we return it unmasked
-          return data; // TODO: Support other data types.
+          // We do not support the data type so we return it null masked
+          return undefined; // TODO: Support other data types.
         }
         // This function will determine which masking type will be performed on the data
         // and then return the value based upon the masking type
         this.maskFunction = function(mask_type, data) {
           const mask = JSON.parse(mask_type);
-        
+
           switch(mask["maskFuncName"]) {
             case "null_mask":
               return undefined;
             case "constant_mask":
               if (mask["maskFuncArgs"] == undefined || mask["maskFuncArgs"].length != 1) {
-                return data;
+                return undefined;
               }
               return mask["maskFuncArgs"][0];
             case "mask":
               return this.preserve_format_mask(data);
             default:
-              return data;
+              return undefined;
           };
         };
       },
@@ -82,3 +88,6 @@ CREATE OR REPLACE FUNCTION %s.CyralMask(mask_spec array, columns array)
           rowWriter.writeRow({MASKED_COLUMNS: row.COLUMNS}); // TODO : try returning a SQL Error instead
         };
       }}';
+
+GRANT USAGE ON FUNCTION ${DB}.${SCHEMA}.${FUNC_NAME}(array, array) TO PUBLIC;
+COMMENT ON FUNCTION ${DB}.${SCHEMA}.${FUNC_NAME}(array, array) IS '${DB}.${SCHEMA}.${FUNC_NAME}\n${VERSION}\n${TIMESTAMP}\n${GITHUB_LINK}';
diff --git a/masking/snowflake/uninstall/udf.sql b/masking/snowflake/uninstall/udf.sql
new file mode 100644
index 0000000..d36ca84
--- /dev/null
+++ b/masking/snowflake/uninstall/udf.sql
@@ -0,0 +1 @@
+DROP FUNCTION IF EXISTS ${DB}.${SCHEMA}.${FUNC_NAME}(array, array);