             UNIT_TIME INT NOT NULL,
             TIME_UNIT VARCHAR(25) NOT NULL,
             IS_DEPLOYED SMALLINT NOT NULL DEFAULT 0,
-	    CUSTOM_ATTRIBUTES BLOB DEFAULT NULL,
-	          UUID VARCHAR(256),
+	          CUSTOM_ATTRIBUTES BLOB DEFAULT NULL,
+	          UUID VARCHAR(256) NOT NULL,
             PRIMARY KEY (POLICY_ID),
             CONSTRAINT APP_NAME_TENANT UNIQUE (NAME, TENANT_ID),
             UNIQUE (UUID)

            DESCRIPTION VARCHAR(1024) NULL DEFAULT NULL,
            SIDDHI_QUERY BLOB DEFAULT NULL,
            IS_DEPLOYED SMALLINT NOT NULL DEFAULT 0,
            UUID VARCHAR(256),
            PRIMARY KEY (POLICY_ID),
            UNIQUE (UUID)
)/

            DEFAULT_TIME_UNIT VARCHAR(25) NOT NULL,
            APPLICABLE_LEVEL VARCHAR(25) NOT NULL,
            IS_DEPLOYED SMALLINT NOT NULL DEFAULT 0,
            UUID VARCHAR(256) NOT NULL,
            PRIMARY KEY (POLICY_ID),
            CONSTRAINT API_NAME_TENANT UNIQUE (NAME, TENANT_ID),
            UNIQUE (UUID)
