diff --git a/src/main/java/org/onosproject/yangutils/translator/tojava/GeneratedJavaFileType.java b/src/main/java/org/onosproject/yangutils/translator/tojava/GeneratedJavaFileType.java
index 1b3c7e0..420520f 100644
--- a/src/main/java/org/onosproject/yangutils/translator/tojava/GeneratedJavaFileType.java
+++ b/src/main/java/org/onosproject/yangutils/translator/tojava/GeneratedJavaFileType.java
@@ -50,15 +50,7 @@
     /**
      * Java interface corresponding to rpc.
      */
-    public static final int GENERATE_RPC_INTERFACE = 16;
-
-    /**
-     * Interface, class file and rpc.
-     */
-    public static final int GENERATE_MANAGER_WITH_RPC = GENERATE_INTERFACE_WITH_BUILDER
-            | GENERATE_RPC_INTERFACE;
-
-    // TODO RPC implementation to be integrated with notification.
+    public static final int GENERATE_SERVICE_AND_MANAGER = 16;
 
     /**
      * Java class corresponding to YANG enumeration.
@@ -82,6 +74,16 @@
             | GENERATE_UNION_CLASS;
 
     /**
+     * Event class.
+     */
+    public static final int GENERATE_EVENT_CLASS = 256;
+
+    /**
+     * Event listener class.
+     */
+    public static final int GENERATE_EVENT_LISTENER_INTERFACE = 512;
+
+    /**
      * Creates an instance of generate java file type.
      */
     private GeneratedJavaFileType() {