diff --git a/ArgusCore/src/main/java/com/salesforce/dva/argus/entity/TSDBEntity.java b/ArgusCore/src/main/java/com/salesforce/dva/argus/entity/TSDBEntity.java
index 6eb25471d..a14c2298b 100644
--- a/ArgusCore/src/main/java/com/salesforce/dva/argus/entity/TSDBEntity.java
+++ b/ArgusCore/src/main/java/com/salesforce/dva/argus/entity/TSDBEntity.java
@@ -47,6 +47,8 @@
  */
 @SuppressWarnings("serial")
 public abstract class TSDBEntity implements Serializable {
+	
+    private static final int NUM_TAGS = 50;
 
     //~ Instance fields ******************************************************************************************************************************
 
@@ -161,7 +163,7 @@ public void setTags(Map<String, String> tags) {
 
     public static void validateTags(Map<String, String> tags) {
     	if(tags != null) {
-    		requireArgument(tags.size() <= 7, "No. of tags = " + tags.size() + ". Too many tags!!!");
+    		requireArgument(tags.size() <= NUM_TAGS, "No. of tags = " + tags.size() + ". Too many tags!!!");
         	
         	for(Map.Entry<String, String> entry : tags.entrySet()) {
         		String key = entry.getKey();
@@ -247,7 +249,7 @@ private void setTag(String key, String value, boolean isUserTag) {
         if (value == null || value.isEmpty()) {
             _tags.remove(key);
         } else {
-        	requireArgument(_tags.size() < 7 || _tags.containsKey(key), "No. of tags = " + _tags.size() + ". Cannot add more tags!!!");
+        	requireArgument(_tags.size() < NUM_TAGS || _tags.containsKey(key), "No. of tags = " + _tags.size() + ". Cannot add more tags!!!");
             _tags.put(key, value);
         }
     }