diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleState.java b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleState.java
index 38ee0a73b187420cfdd3f0bd7527d5196d7bad9f..566c3b785c05ed52060e907b7950dfa56b3452de 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleState.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleState.java
@@ -18,26 +18,18 @@ package eu.teraflow.policy.model;
 
 public class PolicyRuleState {
 
-    private final String policeRuleId;
     private final RuleState ruleState;
 
-    public PolicyRuleState(String policeRuleId, RuleState ruleState) {
-        this.policeRuleId = policeRuleId;
+    public PolicyRuleState(RuleState ruleState) {
         this.ruleState = ruleState;
     }
 
-    public String getPolicyRuleId() {
-        return policeRuleId;
-    }
-
     public RuleState getRuleState() {
         return ruleState;
     }
 
     @Override
     public String toString() {
-        return String.format(
-                "%s:{policeRuleId:\"%s\", ruleState:\"%s\"}",
-                getClass().getSimpleName(), policeRuleId, ruleState);
+        return String.format("%s:{ruleState:\"%s\"}", getClass().getSimpleName(), ruleState.toString());
     }
 }
diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/RuleState.java b/src/policy/src/main/java/eu/teraflow/policy/model/RuleState.java
index 6c8aabdb04399176714f06e85b1a00d18e6e867d..2d01a6b94004158b6e2a4d06fead888ad54b76b1 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/model/RuleState.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/model/RuleState.java
@@ -17,7 +17,15 @@
 package eu.teraflow.policy.model;
 
 public enum RuleState {
-    POLICY_INACTIVE,
-    POLICY_PLANNED,
-    POLICY_ACTIVE
+    POLICY_UNDEFINED,
+    POLICY_FAILED,
+    POLICY_INSERTED,
+    POLICY_VALIDATED,
+    POLICY_PROVISIONED,
+    POLICY_ACTIVE,
+    POLICY_ENFORCED,
+    POLICY_INEFFECTIVE,
+    POLICY_EFFECTIVE,
+    POLICY_UPDATED,
+    POLICY_REMOVED
 }