diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/GeneratedJavaFileType.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/GeneratedJavaFileType.java
index c112ce0..1b3c7e0 100644
--- a/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/GeneratedJavaFileType.java
+++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/GeneratedJavaFileType.java
@@ -44,7 +44,8 @@
     /**
      * Interface and class file.
      */
-    public static final int GENERATE_INTERFACE_WITH_BUILDER = 15;
+    public static final int GENERATE_INTERFACE_WITH_BUILDER = INTERFACE_MASK
+            | BUILDER_INTERFACE_MASK | BUILDER_CLASS_MASK | IMPL_CLASS_MASK;
 
     /**
      * Java interface corresponding to rpc.
@@ -54,24 +55,31 @@
     /**
      * Interface, class file and rpc.
      */
-    public static final int GENERATE_MANAGER_WITH_RPC = 31;
+    public static final int GENERATE_MANAGER_WITH_RPC = GENERATE_INTERFACE_WITH_BUILDER
+            | GENERATE_RPC_INTERFACE;
 
     // TODO RPC implementation to be integrated with notification.
 
     /**
      * Java class corresponding to YANG enumeration.
      */
-    public static final int GENERATE_ENUM_CLASS = 64;
+    public static final int GENERATE_ENUM_CLASS = 32;
 
     /**
      * Java class corresponding to typedef.
      */
-    public static final int GENERATE_TYPEDEF_CLASS = 1024;
+    public static final int GENERATE_TYPEDEF_CLASS = 64;
 
     /**
      * Java class corresponding to union.
      */
-    public static final int GENERATE_UNION_CLASS = 2048;
+    public static final int GENERATE_UNION_CLASS = 128;
+
+    /**
+     * Java class corresponding to typedef.
+     */
+    public static final int GENERATE_TYPE_CLASS = GENERATE_TYPEDEF_CLASS
+            | GENERATE_UNION_CLASS;
 
     /**
      * Creates an instance of generate java file type.