diff --git a/src/main/java/org/onosproject/yangutils/parser/impl/listeners/MaxElementsListener.java b/src/main/java/org/onosproject/yangutils/parser/impl/listeners/MaxElementsListener.java
index d0ba5fa..84eefea 100644
--- a/src/main/java/org/onosproject/yangutils/parser/impl/listeners/MaxElementsListener.java
+++ b/src/main/java/org/onosproject/yangutils/parser/impl/listeners/MaxElementsListener.java
@@ -16,8 +16,17 @@
 
 package org.onosproject.yangutils.parser.impl.listeners;
 
+import org.onosproject.yangutils.datamodel.YangLeafList;
+import org.onosproject.yangutils.datamodel.YangList;
+import org.onosproject.yangutils.parser.Parsable;
+import org.onosproject.yangutils.parser.ParsableDataType;
 import org.onosproject.yangutils.parser.antlrgencode.GeneratedYangParser;
+import org.onosproject.yangutils.parser.exceptions.ParserException;
 import org.onosproject.yangutils.parser.impl.TreeWalkListener;
+import org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorLocation;
+import org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorMessageConstruction;
+import org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorType;
+import org.onosproject.yangutils.parser.impl.parserutils.ListenerValidation;
 
 /*
  * Reference: RFC6020 and YANG ANTLR Grammar
@@ -54,18 +63,33 @@
      */
     public static void processMaxElementsEntry(TreeWalkListener listener,
                                              GeneratedYangParser.MaxElementsStatementContext ctx) {
-        // TODO method implementation
-    }
+        int maxElementsValue;
 
-    /**
-     * It is called when parser exits from grammar rule (max-elements), it performs
-     * validation and updates the data model tree.
-     *
-     * @param listener listener's object.
-     * @param ctx context object of the grammar rule.
-     */
-    public static void processMaxElementsExit(TreeWalkListener listener,
-                                            GeneratedYangParser.MaxElementsStatementContext ctx) {
-        // TODO method implementation
+        // Check for stack to be non empty.
+        ListenerValidation.checkStackIsNotEmpty(listener, ListenerErrorType.MISSING_HOLDER,
+                ParsableDataType.MAX_ELEMENT_DATA, "", ListenerErrorLocation.ENTRY);
+
+        if (ctx.maxValueArgument().UNBOUNDED_KEYWORD() != null) {
+            maxElementsValue = Integer.MAX_VALUE;
+        } else {
+            maxElementsValue = Integer.parseInt(ctx.maxValueArgument().INTEGER().getText());
+        }
+
+        Parsable tmpData = listener.getParsedDataStack().peek();
+        switch (tmpData.getParsableDataType()) {
+            case LEAF_LIST_DATA:
+                YangLeafList leafList = (YangLeafList) tmpData;
+                leafList.setMaxElelements(maxElementsValue);
+                break;
+            case LIST_DATA:
+                YangList yangList = (YangList) tmpData;
+                yangList.setMaxElelements(maxElementsValue);
+                break;
+            default:
+                throw new ParserException(ListenerErrorMessageConstruction
+                        .constructListenerErrorMessage(ListenerErrorType.INVALID_HOLDER,
+                                ParsableDataType.MAX_ELEMENT_DATA,
+                                "", ListenerErrorLocation.ENTRY));
+        }
     }
 }
\ No newline at end of file
