Implemented use of ChildOf interface in generated classes.
[yangtools.git] / code-generator / binding-generator-impl / src / main / java / org / opendaylight / yangtools / sal / binding / generator / impl / BindingGeneratorImpl.xtend
index 5b3bbb28e25fb971575aeddee9e52f593a291d20..257a5c4c76636b0d40f8548fa7c331b7b1c02d54 100644 (file)
-
 /*\r
  * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.\r
  *\r
  * This program and the accompanying materials are made available under the\r
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
- */\r
-package org.opendaylight.yangtools.sal.binding.generator.impl;\r
-\r
-import java.util.ArrayList;\r
-import java.util.Collections;\r
-import java.util.HashMap;\r
-import java.util.List;\r
-import java.util.Map;\r
-import java.util.Set;\r
-import org.opendaylight.yangtools.binding.generator.util.BindingTypes;\r
-import org.opendaylight.yangtools.binding.generator.util.ReferencedTypeImpl;\r
-import org.opendaylight.yangtools.binding.generator.util.Types;\r
-import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl;\r
-import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.GeneratedTypeBuilderImpl;\r
-import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator;\r
-import org.opendaylight.yangtools.sal.binding.generator.spi.TypeProvider;\r
-import org.opendaylight.yangtools.sal.binding.model.api.AccessModifier;\r
-import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType;\r
-import org.opendaylight.yangtools.sal.binding.model.api.Type;\r
-import org.opendaylight.yangtools.sal.binding.model.api.type.builder.EnumBuilder;\r
-import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTOBuilder;\r
-import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTypeBuilder;\r
-import org.opendaylight.yangtools.sal.binding.model.api.type.builder.MethodSignatureBuilder;\r
-import org.opendaylight.yangtools.sal.binding.yang.types.GroupingDefinitionDependencySort;\r
-import org.opendaylight.yangtools.sal.binding.yang.types.TypeProviderImpl;\r
-import org.opendaylight.yangtools.yang.binding.RpcService;\r
-import org.opendaylight.yangtools.yang.common.RpcResult;\r
-import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;\r
-import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;\r
-import org.opendaylight.yangtools.yang.model.api.ChoiceNode;\r
-import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;\r
-import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;\r
-import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;\r
-import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;\r
-import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;\r
-import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;\r
-import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;\r
-import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;\r
-import org.opendaylight.yangtools.yang.model.api.Module;\r
-import org.opendaylight.yangtools.yang.model.api.RpcDefinition;\r
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;\r
-import org.opendaylight.yangtools.yang.model.api.SchemaNode;\r
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;\r
-import org.opendaylight.yangtools.yang.model.api.TypeDefinition;\r
-import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;\r
-import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition;\r
-import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;\r
-import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;\r
-import org.opendaylight.yangtools.yang.model.util.DataNodeIterator;\r
-import org.opendaylight.yangtools.yang.model.util.ExtendedType;\r
-import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil;\r
-import org.opendaylight.yangtools.yang.model.util.UnionType;\r
-import static com.google.common.base.Preconditions.*;\r
-import static extension org.opendaylight.yangtools.binding.generator.util.Types.*;\r
+ */
+package org.opendaylight.yangtools.sal.binding.generator.impl;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.opendaylight.yangtools.binding.generator.util.BindingTypes;
+import org.opendaylight.yangtools.binding.generator.util.ReferencedTypeImpl;
+import org.opendaylight.yangtools.binding.generator.util.Types;
+import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl;
+import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.GeneratedTypeBuilderImpl;
+import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator;
+import org.opendaylight.yangtools.sal.binding.generator.spi.TypeProvider;
+import org.opendaylight.yangtools.sal.binding.model.api.AccessModifier;
+import org.opendaylight.yangtools.sal.binding.model.api.Type;
+import org.opendaylight.yangtools.sal.binding.model.api.type.builder.EnumBuilder;
+import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTOBuilder;
+import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTypeBuilder;
+import org.opendaylight.yangtools.sal.binding.model.api.type.builder.MethodSignatureBuilder;
+import org.opendaylight.yangtools.sal.binding.yang.types.GroupingDefinitionDependencySort;
+import org.opendaylight.yangtools.sal.binding.yang.types.TypeProviderImpl;
+import org.opendaylight.yangtools.yang.binding.RpcService;
+import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
+import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
+import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
+import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
+import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.SchemaNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
+import org.opendaylight.yangtools.yang.model.util.DataNodeIterator;
+import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil;
+import org.opendaylight.yangtools.yang.model.util.UnionType;
+import static com.google.common.base.Preconditions.*;
+import static extension org.opendaylight.yangtools.binding.generator.util.Types.*;
 import static org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil.*;
 import static org.opendaylight.yangtools.binding.generator.util.BindingTypes.*;
 import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.*;
+import org.opendaylight.yangtools.yang.parser.util.ModuleDependencySort
+import org.opendaylight.yangtools.yang.model.util.ExtendedType;
+import org.opendaylight.yangtools.yang.model.api.UsesNode
+import org.opendaylight.yangtools.yang.binding.annotations.RoutingContext
+import org.opendaylight.yangtools.sal.binding.model.api.type.builder.AnnotationTypeBuilder
+import org.opendaylight.yangtools.yang.model.api.ModuleImport
+import org.opendaylight.yangtools.yang.binding.DataContainer
+import java.util.Iterator
+import org.opendaylight.yangtools.yang.model.api.AugmentationTarget
+import java.util.Collection
+import org.opendaylight.yangtools.yang.model.api.YangNode
+import org.opendaylight.yangtools.yang.model.api.NotificationDefinition
+
+public class BindingGeneratorImpl implements BindingGenerator {
+
+    private final Map<Module, ModuleContext> genCtx = new HashMap()
 
-\r
-public class BindingGeneratorImpl implements BindingGenerator {\r
-\r
     /**\r
      * Outter key represents the package name. Outter value represents map of\r
      * all builders in the same package. Inner key represents the schema node\r
      * name (in JAVA class/interface name format). Inner value represents\r
      * instance of builder for schema node specified in key part.\r
-     */\r
-    private Map<String, Map<String, GeneratedTypeBuilder>> genTypeBuilders;\r
-\r
+     */
+    private Map<String, Map<String, GeneratedTypeBuilder>> genTypeBuilders;
+
     /**\r
      * Provide methods for converting YANG types to JAVA types.\r
-     */\r
-    private var TypeProvider typeProvider;\r
-\r
+     */
+    private var TypeProvider typeProvider;
+
     /**\r
      * Holds reference to schema context to resolve data of augmented elemnt\r
      * when creating augmentation builder\r
-     */\r
-    private var SchemaContext schemaContext;\r
-\r
-    /**\r
-     * Each grouping which is converted from schema node to generated type is\r
-     * added to this map with its Schema path as key to make it easier to get\r
-     * reference to it. In schema nodes in <code>uses</code> attribute there is\r
-     * only Schema Path but when building list of implemented interfaces for\r
-     * Schema node the object of type <code>Type</code> is required. So in this\r
-     * case is used this map.\r
-     */\r
-    private val allGroupings = new HashMap<SchemaPath, GeneratedType>();\r
-    \r
-    \r
-    private val yangToJavaMapping = new HashMap<SchemaPath, Type>();\r
-\r
+     */
+    private var SchemaContext schemaContext;
+
     /**\r
      * Constant with the concrete name of namespace.\r
-     */\r
-    private val static String YANG_EXT_NAMESPACE = "urn:opendaylight:yang:extension:yang-ext";\r
-\r
+     */
+    private val static String YANG_EXT_NAMESPACE = "urn:opendaylight:yang:extension:yang-ext";
+
     /**\r
      * Constant with the concrete name of identifier.\r
-     */\r
-    private val static String AUGMENT_IDENTIFIER_NAME = "augment-identifier";\r
-\r
-    \r
+     */
+    private val static String AUGMENT_IDENTIFIER_NAME = "augment-identifier";
+
     /**\r
      * Resolves generated types from <code>context</code> schema nodes of all\r
      * modules.\r
@@ -126,37 +122,16 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *             if param <code>context</code> is null\r
      * @throws IllegalStateException\r
      *             if <code>context</code> contain no modules\r
-     */\r
-    override generateTypes(SchemaContext context) {\r
-        checkArgument(context !== null,"Schema Context reference cannot be NULL.");\r
-        checkState(context.modules !== null,"Schema Context does not contain defined modules.");\r
-        val List<Type> generatedTypes = new ArrayList();\r
-        schemaContext = context;\r
-        typeProvider = new TypeProviderImpl(context);\r
-        val Set<Module> modules = context.modules;\r
-        genTypeBuilders = new HashMap();\r
-        for (module : modules) {\r
-\r
-            generatedTypes.addAll(allGroupingsToGenTypes(module));\r
-\r
-            if (false == module.childNodes.isEmpty()) {\r
-                generatedTypes.add(moduleToDataType(module));\r
-            }\r
-            generatedTypes.addAll(allTypeDefinitionsToGenTypes(module));\r
-            generatedTypes.addAll(allContainersToGenTypes(module));\r
-            generatedTypes.addAll(allListsToGenTypes(module));\r
-            generatedTypes.addAll(allChoicesToGenTypes(module));\r
-            generatedTypes.addAll(allRPCMethodsToGenType(module));\r
-            generatedTypes.addAll(allNotificationsToGenType(module));\r
-            generatedTypes.addAll(allIdentitiesToGenTypes(module, context));\r
-        }\r
-        for (module : modules) {\r
-            generatedTypes.addAll(allAugmentsToGenTypes(module));\r
-            \r
-        }\r
-        return generatedTypes;\r
-    }\r
-\r
+     */
+    override generateTypes(SchemaContext context) {
+        checkArgument(context !== null, "Schema Context reference cannot be NULL.");
+        checkState(context.modules !== null, "Schema Context does not contain defined modules.");
+        schemaContext = context;
+        typeProvider = new TypeProviderImpl(context);
+        val Set<Module> modules = context.modules;
+        return generateTypes(context, modules);
+    }
+
     /**\r
      * Resolves generated types from <code>context</code> schema nodes only for\r
      * modules specified in <code>modules</code>\r
@@ -184,55 +159,56 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *             </ul>\r
      * @throws IllegalStateException\r
      *             if <code>context</code> contain no modules\r
-     */\r
-    override generateTypes(SchemaContext context, Set<Module> modules) {\r
-        checkArgument(context !== null,"Schema Context reference cannot be NULL.");\r
-        checkState(context.modules !== null,"Schema Context does not contain defined modules.");\r
-        checkArgument(modules !== null,"Set of Modules cannot be NULL.");\r
-\r
-        val List<Type> filteredGenTypes = new ArrayList();\r
-        schemaContext = context;\r
-        typeProvider = new TypeProviderImpl(context);\r
-        val Set<Module> contextModules = context.modules;\r
-        genTypeBuilders = new HashMap();\r
-        \r
-        for (contextModule : contextModules) {\r
-            val List<Type> generatedTypes = new ArrayList();\r
-\r
-            generatedTypes.addAll(allGroupingsToGenTypes(contextModule));\r
-            if (false == contextModule.childNodes.isEmpty()) {\r
-                generatedTypes.add(moduleToDataType(contextModule));\r
-            }\r
-            generatedTypes.addAll(allTypeDefinitionsToGenTypes(contextModule));\r
-            generatedTypes.addAll(allContainersToGenTypes(contextModule));\r
-            generatedTypes.addAll(allListsToGenTypes(contextModule));\r
-            generatedTypes.addAll(allChoicesToGenTypes(contextModule));\r
-            generatedTypes.addAll(allRPCMethodsToGenType(contextModule));\r
-            generatedTypes.addAll(allNotificationsToGenType(contextModule));\r
-            generatedTypes.addAll(allIdentitiesToGenTypes(contextModule, context));\r
-            \r
-            if (modules.contains(contextModule)) {\r
-                filteredGenTypes.addAll(generatedTypes);\r
-            }\r
-        }\r
-        for (contextModule : contextModules) {\r
-            val generatedTypes = (allAugmentsToGenTypes(contextModule));\r
-            if (modules.contains(contextModule)) {\r
-                filteredGenTypes.addAll(generatedTypes);\r
-            }\r
-            \r
-        }\r
-        return filteredGenTypes;\r
-    }\r
-\r
+     */
+    override generateTypes(SchemaContext context, Set<Module> modules) {
+        checkArgument(context !== null, "Schema Context reference cannot be NULL.");
+        checkState(context.modules !== null, "Schema Context does not contain defined modules.");
+        checkArgument(modules !== null, "Set of Modules cannot be NULL.");
+
+        schemaContext = context;
+        typeProvider = new TypeProviderImpl(context);
+        val contextModules = ModuleDependencySort.sort(context.modules);
+        genTypeBuilders = new HashMap();
+
+        for (contextModule : contextModules) {
+            moduleToGenTypes(contextModule, context);
+        }
+        for (contextModule : contextModules) {
+            allAugmentsToGenTypes(contextModule);
+        }
+
+        val List<Type> filteredGenTypes = new ArrayList();
+        for (Module m : modules) {
+            filteredGenTypes.addAll(genCtx.get(m).generatedTypes);
+
+        }
+        genCtx.clear;
+
+        return filteredGenTypes;
+    }
+
+    private def void moduleToGenTypes(Module m, SchemaContext context) {
+        genCtx.put(m, new ModuleContext)
+        allTypeDefinitionsToGenTypes(m)
+        groupingsToGenTypes(m, m.groupings)
+        rpcMethodsToGenType(m)
+        allIdentitiesToGenTypes(m, context)
+        notificationsToGenType(m)
+
+        if (!m.childNodes.isEmpty()) {
+            val moduleType = moduleToDataType(m)
+            genCtx.get(m).addModuleNode(moduleType)
+            val basePackageName = moduleNamespaceToPackageName(m);
+            resolveDataSchemaNodes(m, basePackageName, moduleType, moduleType, m.childNodes)
+        }
+    }
+
     /**\r
      * Converts all extended type definitions of module to the list of\r
      * <code>Type</code> objects.\r
      *\r
      * @param module\r
      *            module from which is obtained set of type definitions\r
-     * @return list of <code>Type</code> which are generated from extended\r
-     *         definition types (object of type <code>ExtendedType</code>)\r
      * @throws IllegalArgumentException\r
      *             <ul>\r
      *             <li>if module equals null</li>\r
@@ -240,138 +216,79 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *             <li>if type definitions of module equal null</li>\r
      *             </ul>\r
      *\r
-     */\r
-    private def List<Type> allTypeDefinitionsToGenTypes( Module module) {\r
-        checkArgument(module !== null,"Module reference cannot be NULL.");\r
-        checkArgument(module.name !== null,"Module name cannot be NULL.");\r
-        val Set<TypeDefinition<?>> typeDefinitions = module.typeDefinitions;\r
-        checkState(typeDefinitions !== null,'''Type Definitions for module «module.name» cannot be NULL.''');\r
-\r
-        \r
-        val List<Type> generatedTypes = new ArrayList();\r
-        for ( TypeDefinition<?> typedef : typeDefinitions) {\r
-            if (typedef !== null) {\r
-                val type = (typeProvider as TypeProviderImpl).generatedTypeForExtendedDefinitionType(typedef, typedef);\r
-                if ((type !== null) && !generatedTypes.contains(type)) {\r
-                    generatedTypes.add(type);\r
-                }\r
-            }\r
-        }\r
-        return generatedTypes;\r
-    }\r
-\r
-    /**\r
-     * Converts all <b>containers</b> of the module to the list of\r
-     * <code>Type</code> objects.\r
-     *\r
-     * @param module\r
-     *            module from which is obtained DataNodeIterator to iterate over\r
-     *            all containers\r
-     * @return list of <code>Type</code> which are generated from containers\r
-     *         (objects of type <code>ContainerSchemaNode</code>)\r
-     * @throws IllegalArgumentException\r
-     *             <ul>\r
-     *             <li>if the module equals null</li>\r
-     *             <li>if the name of module equals null</li>\r
-     *             <li>if the set of child nodes equals null</li>\r
-     *             </ul>\r
-     *\r
-     */\r
-    private def List<Type> allContainersToGenTypes( Module module) {\r
-        checkArgument(module !== null,"Module reference cannot be NULL.");\r
-\r
-        checkArgument(module.name !== null,"Module name cannot be NULL.");\r
-\r
-        if (module.childNodes === null) {\r
-            throw new IllegalArgumentException("Reference to Set of Child Nodes in module " + module.name\r
-                    + " cannot be NULL.");\r
-        }\r
-\r
-        val List<Type> generatedTypes = new ArrayList();\r
-        val it = new DataNodeIterator(module);\r
-        val List<ContainerSchemaNode> schemaContainers = it.allContainers();\r
-        val basePackageName = moduleNamespaceToPackageName(module);\r
-        for (container : schemaContainers) {\r
-            if (!container.isAddedByUses()) {\r
-                generatedTypes.add(containerToGenType(basePackageName, container));\r
-            }\r
-        }\r
-        return generatedTypes;\r
-    }\r
-\r
-    /**\r
-     * Converts all <b>lists</b> of the module to the list of <code>Type</code>\r
-     * objects.\r
-     *\r
-     * @param module\r
-     *            module from which is obtained DataNodeIterator to iterate over\r
-     *            all lists\r
-     * @return list of <code>Type</code> which are generated from lists (objects\r
-     *         of type <code>ListSchemaNode</code>)\r
-     * @throws IllegalArgumentException\r
-     *             <ul>\r
-     *             <li>if the module equals null</li>\r
-     *             <li>if the name of module equals null</li>\r
-     *             <li>if the set of child nodes equals null</li>\r
-     *             </ul>\r
-     *\r
-     */\r
-    private def List<Type> allListsToGenTypes( Module module) {\r
-        checkArgument(module !== null,"Module reference cannot be NULL.");\r
-        checkArgument(module.name !== null,"Module name cannot be NULL.");\r
-\r
-        if (module.childNodes === null) {\r
-            throw new IllegalArgumentException("Reference to Set of Child Nodes in module " + module.name\r
-                    + " cannot be NULL.");\r
-        }\r
-\r
-        val List<Type> generatedTypes = new ArrayList();\r
-        val it = new DataNodeIterator(module);\r
-        val List<ListSchemaNode> schemaLists = it.allLists();\r
-        val basePackageName = moduleNamespaceToPackageName(module);\r
-        if (schemaLists !== null) {\r
-            for (list : schemaLists) {\r
-                if (!list.isAddedByUses()) {\r
-                    generatedTypes.addAll(listToGenType(basePackageName, list));\r
-                }\r
-            }\r
-        }\r
-        return generatedTypes;\r
-    }\r
-\r
-    /**\r
-     * Converts all <b>choices</b> of the module to the list of\r
-     * <code>Type</code> objects.\r
-     *\r
-     * @param module\r
-     *            module from which is obtained DataNodeIterator to iterate over\r
-     *            all choices\r
-     * @return list of <code>Type</code> which are generated from choices\r
-     *         (objects of type <code>ChoiceNode</code>)\r
-     * @throws IllegalArgumentException\r
-     *             <ul>\r
-     *             <li>if the module equals null</li>\r
-     *             <li>if the name of module equals null</li> *\r
-     *             </ul>\r
-     *\r
-     */\r
-    private def List<GeneratedType> allChoicesToGenTypes( Module module) {\r
-        checkArgument(module !== null,"Module reference cannot be NULL.");\r
-        checkArgument(module.name !== null,"Module name cannot be NULL.");\r
-\r
-        val it = new DataNodeIterator(module);\r
-        val choiceNodes = it.allChoices();\r
-        val basePackageName = moduleNamespaceToPackageName(module);\r
-\r
-        val List<GeneratedType> generatedTypes = new ArrayList();\r
-        for (choice : choiceNodes) {\r
-            if ((choice !== null) && !choice.isAddedByUses()) {\r
-                generatedTypes.addAll(choiceToGeneratedType(basePackageName, choice));\r
-            }\r
-        }\r
-        return generatedTypes;\r
-    }\r
-\r
+     */
+    private def void allTypeDefinitionsToGenTypes(Module module) {
+        checkArgument(module !== null, "Module reference cannot be NULL.");
+        checkArgument(module.name !== null, "Module name cannot be NULL.");
+        val it = new DataNodeIterator(module);
+        val List<TypeDefinition<?>> typeDefinitions = it.allTypedefs;
+        checkState(typeDefinitions !== null, '''Type Definitions for module «module.name» cannot be NULL.''');
+
+        for (TypeDefinition<?> typedef : typeDefinitions) {
+            if (typedef !== null) {
+                val type = (typeProvider as TypeProviderImpl).generatedTypeForExtendedDefinitionType(typedef, typedef);
+                if (type !== null) {
+                    genCtx.get(module).addTypedefType(typedef.path, type)
+                }
+            }
+        }
+    }
+
+    private def void containerToGenType(Module module, String basePackageName, GeneratedTypeBuilder parent,
+        GeneratedTypeBuilder childOf, ContainerSchemaNode node) {
+        if (node.augmenting || node.addedByUses) {
+            return
+        }
+        val packageName = packageNameForGeneratedType(basePackageName, node.path)
+        val genType = addDefaultInterfaceDefinition(packageName, node, childOf)
+        constructGetter(parent, node.QName.localName, node.description, genType)
+        genCtx.get(module).addChildNodeType(node.path, genType)
+        resolveDataSchemaNodes(module, basePackageName, genType, genType, node.childNodes)
+        groupingsToGenTypes(module, node.groupings)
+        processUsesAugments(node, module)
+    }
+
+    private def void listToGenType(Module module, String basePackageName, GeneratedTypeBuilder parent,
+        GeneratedTypeBuilder childOf, ListSchemaNode node) {
+        if (node.augmenting || node.addedByUses) {
+            return
+        }
+        val packageName = packageNameForGeneratedType(basePackageName, (node).path)
+        val genType = addDefaultInterfaceDefinition(packageName, node, childOf)
+        constructGetter(parent, node.QName.localName, node.description, Types.listTypeFor(genType))
+        genCtx.get(module).addChildNodeType(node.path, genType)
+        groupingsToGenTypes(module, node.groupings)
+        processUsesAugments(node, module)
+
+        val List<String> listKeys = listKeys(node);
+        val genTOBuilder = resolveListKeyTOBuilder(packageName, node);
+
+        if (genTOBuilder !== null) {
+            val identifierMarker = IDENTIFIER.parameterizedTypeFor(genType);
+            val identifiableMarker = IDENTIFIABLE.parameterizedTypeFor(genTOBuilder);
+            genTOBuilder.addImplementsType(identifierMarker);
+            genType.addImplementsType(identifiableMarker);
+        }
+
+        for (schemaNode : node.childNodes) {
+            if (!schemaNode.augmenting) {
+                addSchemaNodeToListBuilders(basePackageName, schemaNode, genType, genTOBuilder, listKeys, module);
+            }
+        }
+
+        typeBuildersToGenTypes(module, genType, genTOBuilder);
+    }
+
+    private def void processUsesAugments(DataNodeContainer node, Module module) {
+        val basePackageName = moduleNamespaceToPackageName(module);
+        for (usesNode : node.uses) {
+            for (augment : usesNode.augmentations) {
+                augmentationToGenTypes(basePackageName, augment, module, usesNode);
+                processUsesAugments(augment, module);
+            }
+        }
+    }
+
     /**\r
      * Converts all <b>augmentation</b> of the module to the list\r
      * <code>Type</code> objects.\r
@@ -379,8 +296,6 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * @param module\r
      *            module from which is obtained list of all augmentation objects\r
      *            to iterate over them\r
-     * @return list of <code>Type</code> which are generated from augments\r
-     *         (objects of type <code>AugmentationSchema</code>)\r
      * @throws IllegalArgumentException\r
      *             <ul>\r
      *             <li>if the module equals null</li>\r
@@ -388,24 +303,22 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *             <li>if the set of child nodes equals null</li>\r
      *             </ul>\r
      *\r
-     */\r
-    private def List<Type> allAugmentsToGenTypes( Module module) {\r
-        checkArgument(module !== null,"Module reference cannot be NULL.");\r
-        checkArgument(module.name !== null,"Module name cannot be NULL.");\r
-        if (module.childNodes === null) {\r
-            throw new IllegalArgumentException("Reference to Set of Augmentation Definitions in module "\r
-                    + module.name + " cannot be NULL.");\r
-        }\r
-\r
-        val List<Type> generatedTypes = new ArrayList();\r
-        val basePackageName = moduleNamespaceToPackageName(module);\r
-        val List<AugmentationSchema> augmentations = resolveAugmentations(module);\r
-        for (augment : augmentations) {\r
-            generatedTypes.addAll(augmentationToGenTypes(basePackageName, augment));\r
-        }\r
-        return generatedTypes;\r
-    }\r
-\r
+     */
+    private def void allAugmentsToGenTypes(Module module) {
+        checkArgument(module !== null, "Module reference cannot be NULL.");
+        checkArgument(module.name !== null, "Module name cannot be NULL.");
+        if (module.childNodes === null) {
+            throw new IllegalArgumentException(
+                "Reference to Set of Augmentation Definitions in module " + module.name + " cannot be NULL.");
+        }
+
+        val basePackageName = moduleNamespaceToPackageName(module);
+        val List<AugmentationSchema> augmentations = resolveAugmentations(module);
+        for (augment : augmentations) {
+            augmentationToGenTypes(basePackageName, augment, module, null);
+        }
+    }
+
     /**\r
      * Returns list of <code>AugmentationSchema</code> objects. The objects are\r
      * sorted according to the length of their target path from the shortest to\r
@@ -421,25 +334,25 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *             <li>if the set of augmentation equals null</li>\r
      *             </ul>\r
      *\r
-     */\r
-    private def List<AugmentationSchema> resolveAugmentations( Module module) {\r
-        checkArgument(module !== null,"Module reference cannot be NULL.");\r
-        checkState(module.augmentations !== null,"Augmentations Set cannot be NULL.");\r
-\r
-        val Set<AugmentationSchema> augmentations = module.augmentations;\r
-        val List<AugmentationSchema> sortedAugmentations = new ArrayList(augmentations);\r
-        Collections.sort(sortedAugmentations, [augSchema1, augSchema2 |\r
-\r
-                if (augSchema1.targetPath.path.size() > augSchema2.targetPath.path.size()) {\r
-                    return 1;\r
-                } else if (augSchema1.targetPath.path.size() < augSchema2.targetPath.path.size()) {\r
-                    return -1;\r
-                }\r
-                return 0;\r
-           ]);\r
-        return sortedAugmentations;\r
-    }\r
-\r
+     */
+    private def List<AugmentationSchema> resolveAugmentations(Module module) {
+        checkArgument(module !== null, "Module reference cannot be NULL.");
+        checkState(module.augmentations !== null, "Augmentations Set cannot be NULL.");
+
+        val Set<AugmentationSchema> augmentations = module.augmentations;
+        val List<AugmentationSchema> sortedAugmentations = new ArrayList(augmentations);
+        Collections.sort(sortedAugmentations,
+            [ augSchema1, augSchema2 |
+                if (augSchema1.targetPath.path.size() > augSchema2.targetPath.path.size()) {
+                    return 1;
+                } else if (augSchema1.targetPath.path.size() < augSchema2.targetPath.path.size()) {
+                    return -1;
+                }
+                return 0;
+            ]);
+        return sortedAugmentations;
+    }
+
     /**\r
      * Converts whole <b>module</b> to <code>GeneratedType</code> object.\r
      * Firstly is created the module builder object from which is vally\r
@@ -453,22 +366,16 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * @throws IllegalArgumentException\r
      *             if the module equals null\r
      *\r
-     */\r
-    private def GeneratedType moduleToDataType( Module module) {\r
-        checkArgument(module !== null,"Module reference cannot be NULL.");\r
-\r
-        val moduleDataTypeBuilder = moduleTypeBuilder(module, "Data");\r
-        addImplementedInterfaceFromUses(module, moduleDataTypeBuilder);\r
-        moduleDataTypeBuilder.addImplementsType(DATA_ROOT);\r
-\r
-        val basePackageName = moduleNamespaceToPackageName(module);\r
-        if (moduleDataTypeBuilder !== null) {\r
-            val Set<DataSchemaNode> dataNodes = module.childNodes;\r
-            resolveDataSchemaNodes(basePackageName, moduleDataTypeBuilder, dataNodes);\r
-        }\r
-        return moduleDataTypeBuilder.toInstance();\r
-    }\r
-\r
+     */
+    private def GeneratedTypeBuilder moduleToDataType(Module module) {
+        checkArgument(module !== null, "Module reference cannot be NULL.");
+
+        val moduleDataTypeBuilder = moduleTypeBuilder(module, "Data");
+        addImplementedInterfaceFromUses(module, moduleDataTypeBuilder);
+        moduleDataTypeBuilder.addImplementsType(DATA_ROOT);
+        return moduleDataTypeBuilder;
+    }
+
     /**\r
      * Converts all <b>rpcs</b> inputs and outputs substatements of the module\r
      * to the list of <code>Type</code> objects. In addition are to containers\r
@@ -477,8 +384,6 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * @param module\r
      *            module from which is obtained set of all rpc objects to\r
      *            iterate over them\r
-     * @return list of <code>Type</code> which are generated from rpcs inputs,\r
-     *         outputs + container and lists which are part of inputs or outputs\r
      * @throws IllegalArgumentException\r
      *             <ul>\r
      *             <li>if the module equals null</li>\r
@@ -486,91 +391,59 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *             <li>if the set of child nodes equals null</li>\r
      *             </ul>\r
      *\r
-     */\r
-    private def List<Type> allRPCMethodsToGenType( Module module) {\r
-        checkArgument(module !== null,"Module reference cannot be NULL.");\r
-\r
-        checkArgument(module.name !== null,"Module name cannot be NULL.");\r
-\r
-        if (module.childNodes === null) {\r
-            throw new IllegalArgumentException("Reference to Set of RPC Method Definitions in module "\r
-                    + module.name + " cannot be NULL.");\r
-        }\r
-\r
-        val basePackageName = moduleNamespaceToPackageName(module);\r
-        val Set<RpcDefinition> rpcDefinitions = module.rpcs;\r
-\r
-        if (rpcDefinitions.isEmpty()) {\r
-            return Collections.emptyList();\r
-        }\r
-\r
-        val List<Type> genRPCTypes = new ArrayList();\r
-        val interfaceBuilder = moduleTypeBuilder(module, "Service");\r
-        interfaceBuilder.addImplementsType(Types.typeForClass(RpcService));\r
-        for (rpc : rpcDefinitions) {\r
-            if (rpc !== null) {\r
-\r
-                val rpcName = parseToClassName(rpc.QName.localName);\r
-                val rpcMethodName = parseToValidParamName(rpcName);\r
-                val method = interfaceBuilder.addMethod(rpcMethodName);\r
-\r
-                val rpcInOut = new ArrayList();\r
-\r
-                val input = rpc.input;\r
-                val output = rpc.output;\r
-\r
-                if (input !== null) {\r
-                    rpcInOut.add(new DataNodeIterator(input));\r
-                    val inType = addRawInterfaceDefinition(basePackageName, input, rpcName);\r
-                    addImplementedInterfaceFromUses(input, inType);\r
-                    inType.addImplementsType(DATA_OBJECT);\r
-                    inType.addImplementsType(augmentable(inType));\r
-                    resolveDataSchemaNodes(basePackageName, inType, input.childNodes);\r
-                    val inTypeInstance = inType.toInstance();\r
-                    genRPCTypes.add(inTypeInstance);\r
-                    method.addParameter(inTypeInstance, "input");\r
-                }\r
-\r
-                var Type outTypeInstance = VOID;\r
-                if (output !== null) {\r
-                    rpcInOut.add(new DataNodeIterator(output));\r
-                    val outType = addRawInterfaceDefinition(basePackageName, output, rpcName);\r
-                    addImplementedInterfaceFromUses(output, outType);\r
-                    outType.addImplementsType(DATA_OBJECT);\r
-                    outType.addImplementsType(augmentable(outType));\r
-\r
-                    resolveDataSchemaNodes(basePackageName, outType, output.childNodes);\r
-                    outTypeInstance = outType.toInstance();\r
-                    genRPCTypes.add(outTypeInstance);\r
-\r
-                }\r
-\r
-                val rpcRes = Types.parameterizedTypeFor(Types.typeForClass(RpcResult), outTypeInstance);\r
-                method.setReturnType(Types.parameterizedTypeFor(FUTURE, rpcRes));\r
-                for (iter : rpcInOut) {\r
-                    val List<ContainerSchemaNode> nContainers = iter.allContainers();\r
-                    if ((nContainers !== null) && !nContainers.isEmpty()) {\r
-                        for (container : nContainers) {\r
-                            if (!container.isAddedByUses()) {\r
-                                genRPCTypes.add(containerToGenType(basePackageName, container));\r
-                            }\r
-                        }\r
-                    }\r
-                    val List<ListSchemaNode> nLists = iter.allLists();\r
-                    if ((nLists !== null) && !nLists.isEmpty()) {\r
-                        for (list : nLists) {\r
-                            if (!list.isAddedByUses()) {\r
-                                genRPCTypes.addAll(listToGenType(basePackageName, list));\r
-                            }\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-        }\r
-        genRPCTypes.add(interfaceBuilder.toInstance());\r
-        return genRPCTypes;\r
-    }\r
-\r
+     */
+    private def void rpcMethodsToGenType(Module module) {
+        checkArgument(module !== null, "Module reference cannot be NULL.");
+        checkArgument(module.name !== null, "Module name cannot be NULL.");
+        checkArgument(module.childNodes !== null,
+            "Reference to Set of RPC Method Definitions in module " + module.name + " cannot be NULL.");
+
+        val basePackageName = moduleNamespaceToPackageName(module);
+        val Set<RpcDefinition> rpcDefinitions = module.rpcs;
+        if (rpcDefinitions.isEmpty()) {
+            return;
+        }
+
+        val interfaceBuilder = moduleTypeBuilder(module, "Service");
+        interfaceBuilder.addImplementsType(Types.typeForClass(RpcService));
+        for (rpc : rpcDefinitions) {
+            if (rpc !== null) {
+                val rpcName = parseToClassName(rpc.QName.localName);
+                val rpcMethodName = parseToValidParamName(rpcName);
+                val method = interfaceBuilder.addMethod(rpcMethodName);
+                val input = rpc.input;
+                val output = rpc.output;
+
+                if (input !== null) {
+                    val inType = addRawInterfaceDefinition(basePackageName, input, rpcName);
+                    addImplementedInterfaceFromUses(input, inType);
+                    inType.addImplementsType(DATA_OBJECT);
+                    inType.addImplementsType(augmentable(inType));
+                    resolveDataSchemaNodes(module, basePackageName, inType, inType, input.childNodes);
+                    genCtx.get(module).addChildNodeType(input.path, inType)
+                    val inTypeInstance = inType.toInstance();
+                    method.addParameter(inTypeInstance, "input");
+                }
+
+                var Type outTypeInstance = VOID;
+                if (output !== null) {
+                    val outType = addRawInterfaceDefinition(basePackageName, output, rpcName);
+                    addImplementedInterfaceFromUses(output, outType);
+                    outType.addImplementsType(DATA_OBJECT);
+                    outType.addImplementsType(augmentable(outType));
+                    resolveDataSchemaNodes(module, basePackageName, outType, outType, output.childNodes);
+                    genCtx.get(module).addChildNodeType(output.path, outType)
+                    outTypeInstance = outType.toInstance();
+                }
+
+                val rpcRes = Types.parameterizedTypeFor(Types.typeForClass(RpcResult), outTypeInstance);
+                method.setReturnType(Types.parameterizedTypeFor(FUTURE, rpcRes));
+            }
+        }
+
+        genCtx.get(module).addTopLevelNodeType(interfaceBuilder)
+    }
+
     /**\r
      * Converts all <b>notifications</b> of the module to the list of\r
      * <code>Type</code> objects. In addition are to this list added containers\r
@@ -579,8 +452,6 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * @param module\r
      *            module from which is obtained set of all notification objects\r
      *            to iterate over them\r
-     * @return list of <code>Type</code> which are generated from notification\r
-     *         (object of type <code>NotificationDefinition</code>\r
      * @throws IllegalArgumentException\r
      *             <ul>\r
      *             <li>if the module equals null</li>\r
@@ -588,62 +459,44 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *             <li>if the set of child nodes equals null</li>\r
      *             </ul>\r
      *\r
-     */\r
-    private def List<Type> allNotificationsToGenType( Module module) {\r
-        checkArgument(module !== null,"Module reference cannot be NULL.");\r
-\r
-        checkArgument(module.name !== null,"Module name cannot be NULL.");\r
-\r
-        if (module.childNodes === null) {\r
-            throw new IllegalArgumentException("Reference to Set of Notification Definitions in module "\r
-                    + module.name + " cannot be NULL.");\r
-        }\r
-        val notifications = module.notifications;\r
-        if(notifications.isEmpty()) return Collections.emptyList();\r
-        \r
-        val listenerInterface = moduleTypeBuilder(module, "Listener");\r
-        listenerInterface.addImplementsType(BindingTypes.NOTIFICATION_LISTENER);\r
-        \r
-        \r
-        \r
-        val basePackageName = moduleNamespaceToPackageName(module);\r
-        val List<Type> generatedTypes = new ArrayList();\r
-        \r
-        \r
-        for ( notification : notifications) {\r
-            if (notification !== null) {\r
-                val iter = new DataNodeIterator(notification);\r
-\r
-                // Containers\r
-                for (node : iter.allContainers()) {\r
-                    if (!node.isAddedByUses()) {\r
-                        generatedTypes.add(containerToGenType(basePackageName, node));\r
-                    }\r
-                }\r
-                // Lists\r
-                for (node : iter.allLists()) {\r
-                    if (!node.isAddedByUses()) {\r
-                        generatedTypes.addAll(listToGenType(basePackageName, node));\r
-                    }\r
-                }\r
-                val notificationInterface = addDefaultInterfaceDefinition(basePackageName,\r
-                        notification);\r
-                notificationInterface.addImplementsType(NOTIFICATION);\r
+     */
+    private def void notificationsToGenType(Module module) {
+        checkArgument(module !== null, "Module reference cannot be NULL.");
+        checkArgument(module.name !== null, "Module name cannot be NULL.");
+
+        if (module.childNodes === null) {
+            throw new IllegalArgumentException(
+                "Reference to Set of Notification Definitions in module " + module.name + " cannot be NULL.");
+        }
+        val notifications = module.notifications;
+        if(notifications.empty) return;
+
+        val listenerInterface = moduleTypeBuilder(module, "Listener");
+        listenerInterface.addImplementsType(BindingTypes.NOTIFICATION_LISTENER);
+        val basePackageName = moduleNamespaceToPackageName(module);
+
+        for (notification : notifications) {
+            if (notification !== null) {
+                processUsesAugments(notification, module);
+
+                val notificationInterface = addDefaultInterfaceDefinition(basePackageName, notification,
+                    BindingTypes.DATA_OBJECT);
+                notificationInterface.addImplementsType(NOTIFICATION);
+                genCtx.get(module).addChildNodeType(notification.path, notificationInterface)
+
                 // Notification object\r
-                resolveDataSchemaNodes(basePackageName, notificationInterface, notification.childNodes);\r
-                \r
-                listenerInterface.addMethod("on"+notificationInterface.name) //\r
-                    .setAccessModifier(AccessModifier.PUBLIC)\r
-                    .addParameter(notificationInterface, "notification")\r
-                    .setReturnType(Types.VOID);\r
-                \r
-                generatedTypes.add(notificationInterface.toInstance());\r
-            }\r
-        }\r
-        generatedTypes.add(listenerInterface.toInstance());\r
-        return generatedTypes;\r
-    }\r
-\r
+                resolveDataSchemaNodes(module, basePackageName, notificationInterface, notificationInterface,
+                    notification.childNodes);
+
+                listenerInterface.addMethod("on" + notificationInterface.name) //\r
+                .setAccessModifier(AccessModifier.PUBLIC).addParameter(notificationInterface, "notification").
+                    setReturnType(Types.VOID);
+            }
+        }
+
+        genCtx.get(module).addTopLevelNodeType(listenerInterface)
+    }
+
     /**\r
      * Converts all <b>identities</b> of the module to the list of\r
      * <code>Type</code> objects.\r
@@ -654,25 +507,19 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * @param context\r
      *            schema context only used as input parameter for method\r
      *            {@link identityToGenType}\r
-     * @return list of <code>Type</code> which are generated from identities\r
-     *         (object of type <code>IdentitySchemaNode</code>\r
      *\r
-     */\r
-    private def List<Type> allIdentitiesToGenTypes( Module module, SchemaContext context) {\r
-        val List<Type> genTypes = new ArrayList();\r
-\r
-        val Set<IdentitySchemaNode> schemaIdentities = module.identities;\r
-\r
-        val basePackageName = moduleNamespaceToPackageName(module);\r
-\r
-        if (schemaIdentities !== null && !schemaIdentities.isEmpty()) {\r
-            for (identity : schemaIdentities) {\r
-                genTypes.add(identityToGenType(basePackageName, identity, context));\r
-            }\r
-        }\r
-        return genTypes;\r
-    }\r
-\r
+     */
+    private def void allIdentitiesToGenTypes(Module module, SchemaContext context) {
+        val Set<IdentitySchemaNode> schemaIdentities = module.identities;
+        val basePackageName = moduleNamespaceToPackageName(module);
+
+        if (schemaIdentities !== null && !schemaIdentities.isEmpty()) {
+            for (identity : schemaIdentities) {
+                identityToGenType(module, basePackageName, identity, context);
+            }
+        }
+    }
+
     /**\r
      * Converts the <b>identity</b> object to GeneratedType. Firstly it is\r
      * created transport object builder. If identity contains base identity then\r
@@ -681,6 +528,7 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * class {@link org.opendaylight.yangtools.yang.model.api.BaseIdentity\r
      * BaseIdentity} is added\r
      *\r
+     * @param module current module\r
      * @param basePackageName\r
      *            string contains the module package name\r
      * @param identity\r
@@ -689,36 +537,29 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *            SchemaContext which is used to get package and name\r
      *            information about base of identity\r
      *\r
-     * @return GeneratedType which is generated from identity (object of type\r
-     *         <code>IdentitySchemaNode</code>\r
-     *\r
-     */\r
-    private def GeneratedType identityToGenType(String basePackageName, IdentitySchemaNode identity,\r
-            SchemaContext context) {\r
-        if (identity === null) {\r
-            return null;\r
-        }\r
-\r
-        val packageName = packageNameForGeneratedType(basePackageName, identity.path);\r
-        val genTypeName = parseToClassName(identity.QName.localName);\r
-        val newType = new GeneratedTOBuilderImpl(packageName, genTypeName);\r
-\r
-        val baseIdentity = identity.baseIdentity;\r
-        if (baseIdentity !== null) {\r
-            val baseIdentityParentModule = SchemaContextUtil.findParentModule(context, baseIdentity);\r
-\r
-            val returnTypePkgName = moduleNamespaceToPackageName(baseIdentityParentModule);\r
-            val returnTypeName = parseToClassName(baseIdentity.QName.localName);\r
-\r
-            val gto = new GeneratedTOBuilderImpl(returnTypePkgName, returnTypeName).toInstance();\r
-            newType.setExtendsType(gto);\r
-        } else {\r
-            newType.setExtendsType(Types.baseIdentityTO);\r
-        }\r
-        newType.setAbstract(true);\r
-        return newType.toInstance();\r
-    }\r
-\r
+     */
+    private def void identityToGenType(Module module, String basePackageName, IdentitySchemaNode identity,
+        SchemaContext context) {
+        if (identity === null) {
+            return;
+        }
+        val packageName = packageNameForGeneratedType(basePackageName, identity.path);
+        val genTypeName = parseToClassName(identity.QName.localName);
+        val newType = new GeneratedTOBuilderImpl(packageName, genTypeName);
+        val baseIdentity = identity.baseIdentity;
+        if (baseIdentity === null) {
+            newType.setExtendsType(Types.baseIdentityTO);
+        } else {
+            val baseIdentityParentModule = SchemaContextUtil.findParentModule(context, baseIdentity);
+            val returnTypePkgName = moduleNamespaceToPackageName(baseIdentityParentModule);
+            val returnTypeName = parseToClassName(baseIdentity.QName.localName);
+            val gto = new GeneratedTOBuilderImpl(returnTypePkgName, returnTypeName).toInstance();
+            newType.setExtendsType(gto);
+        }
+        newType.setAbstract(true);
+        genCtx.get(module).addIdentityType(newType)
+    }
+
     /**\r
      * Converts all <b>groupings</b> of the module to the list of\r
      * <code>Type</code> objects. Firstly are groupings sorted according mutual\r
@@ -727,28 +568,19 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * {@link BindingGeneratorImpl#allGroupings allGroupings}\r
      *\r
      * @param module\r
-     *            module from which is obtained set of all grouping objects to\r
-     *            iterate over them\r
-     * @return list of <code>Type</code> which are generated from groupings\r
-     *         (object of type <code>GroupingDefinition</code>)\r
-     *\r
-     */\r
-    private def List<Type> allGroupingsToGenTypes( Module module) {\r
-        checkArgument(module !== null,"Module parameter can not be null");\r
-        val List<Type> genTypes = new ArrayList();\r
-        val basePackageName = moduleNamespaceToPackageName(module);\r
-        val Set<GroupingDefinition> groupings = module.groupings;\r
-        val List<GroupingDefinition> groupingsSortedByDependencies = new GroupingDefinitionDependencySort().sort(groupings);\r
-\r
-        for (grouping : groupingsSortedByDependencies) {\r
-            val genType = groupingToGenType(basePackageName, grouping);\r
-            genTypes.add(genType);\r
-            val schemaPath = grouping.path;\r
-            allGroupings.put(schemaPath, genType);\r
-        }\r
-        return genTypes;\r
-    }\r
-\r
+     *            current module\r
+     * @param collection of groupings from which types will be generated\r
+     *\r
+     */
+    private def void groupingsToGenTypes(Module module, Collection<GroupingDefinition> groupings) {
+        val basePackageName = moduleNamespaceToPackageName(module);
+        val List<GroupingDefinition> groupingsSortedByDependencies = new GroupingDefinitionDependencySort().sort(
+            groupings);
+        for (grouping : groupingsSortedByDependencies) {
+            groupingToGenType(basePackageName, grouping, module);
+        }
+    }
+
     /**\r
      * Converts individual grouping to GeneratedType. Firstly generated type\r
      * builder is created and every child node of grouping is resolved to the\r
@@ -758,22 +590,19 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *            string contains the module package name\r
      * @param grouping\r
      *            GroupingDefinition which contains data about grouping\r
+     * @param module current module\r
      * @return GeneratedType which is generated from grouping (object of type\r
      *         <code>GroupingDefinition</code>)\r
-     */\r
-    private def GeneratedType groupingToGenType( String basePackageName, GroupingDefinition grouping) {\r
-        if (grouping === null) {\r
-            return null;\r
-        }\r
-\r
-        val packageName = packageNameForGeneratedType(basePackageName, grouping.path);\r
-        val Set<DataSchemaNode> schemaNodes = grouping.childNodes;\r
-        val typeBuilder = addDefaultInterfaceDefinition(packageName, grouping);\r
-\r
-        resolveDataSchemaNodes(basePackageName, typeBuilder, schemaNodes);\r
-        return typeBuilder.toInstance();\r
-    }\r
-\r
+     */
+    private def void groupingToGenType(String basePackageName, GroupingDefinition grouping, Module module) {
+        val packageName = packageNameForGeneratedType(basePackageName, grouping.path);
+        val genType = addDefaultInterfaceDefinition(packageName, grouping);
+        genCtx.get(module).addGroupingType(grouping.path, genType)
+        resolveDataSchemaNodes(module, basePackageName, genType, genType, grouping.childNodes);
+        groupingsToGenTypes(module, grouping.groupings);
+        processUsesAugments(grouping, module);
+    }
+
     /**\r
      * Tries to find EnumTypeDefinition in <code>typeDefinition</code>. If base\r
      * type of <code>typeDefinition</code> is of the type ExtendedType then this\r
@@ -784,18 +613,18 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *            base type\r
      * @return EnumTypeDefinition if it is found inside\r
      *         <code>typeDefinition</code> or <code>null</code> in other case\r
-     */\r
-    private def EnumTypeDefinition enumTypeDefFromExtendedType( TypeDefinition<?> typeDefinition) {\r
-        if (typeDefinition !== null) {\r
-            if (typeDefinition.baseType instanceof EnumTypeDefinition) {\r
-                return typeDefinition.baseType as EnumTypeDefinition;\r
-            } else if (typeDefinition.baseType instanceof ExtendedType) {\r
-                return enumTypeDefFromExtendedType(typeDefinition.baseType);\r
-            }\r
-        }\r
-        return null;\r
-    }\r
-\r
+     */
+    private def EnumTypeDefinition enumTypeDefFromExtendedType(TypeDefinition<?> typeDefinition) {
+        if (typeDefinition !== null) {
+            if (typeDefinition.baseType instanceof EnumTypeDefinition) {
+                return typeDefinition.baseType as EnumTypeDefinition;
+            } else if (typeDefinition.baseType instanceof ExtendedType) {
+                return enumTypeDefFromExtendedType(typeDefinition.baseType);
+            }
+        }
+        return null;
+    }
+
     /**\r
      * Adds enumeration builder created from <code>enumTypeDef</code> to\r
      * <code>typeBuilder</code>.\r
@@ -812,21 +641,19 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *            GeneratedTypeBuilder to which will be enum builder assigned\r
      * @return enumeration builder which contais data from\r
      *         <code>enumTypeDef</code>\r
-     */\r
-    private def EnumBuilder resolveInnerEnumFromTypeDefinition( EnumTypeDefinition enumTypeDef, String enumName,\r
-            GeneratedTypeBuilder typeBuilder) {\r
-        if ((enumTypeDef !== null) && (typeBuilder !== null) && (enumTypeDef.QName !== null)\r
-                && (enumTypeDef.QName.localName !== null)) {\r
-\r
-            val enumerationName = parseToClassName(enumName);\r
-            val enumBuilder = typeBuilder.addEnumeration(enumerationName);\r
-            enumBuilder.updateEnumPairsFromEnumTypeDef(enumTypeDef);\r
-\r
-            return enumBuilder;\r
-        }\r
-        return null;\r
-    }\r
-\r
+     */
+    private def EnumBuilder resolveInnerEnumFromTypeDefinition(EnumTypeDefinition enumTypeDef, String enumName,
+        GeneratedTypeBuilder typeBuilder) {
+        if ((enumTypeDef !== null) && (typeBuilder !== null) && (enumTypeDef.QName !== null) &&
+            (enumTypeDef.QName.localName !== null)) {
+            val enumerationName = parseToClassName(enumName);
+            val enumBuilder = typeBuilder.addEnumeration(enumerationName);
+            enumBuilder.updateEnumPairsFromEnumTypeDef(enumTypeDef);
+            return enumBuilder;
+        }
+        return null;
+    }
+
     /**\r
      * Generates type builder for <code>module</code>.\r
      *\r
@@ -840,16 +667,14 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *         <code>module</code>.\r
      * @throws IllegalArgumentException\r
      *             if <code>module</code> equals null\r
-     */\r
-    private def GeneratedTypeBuilder moduleTypeBuilder( Module module, String postfix) {\r
-        checkArgument(module !== null,"Module reference cannot be NULL.");\r
-        val packageName = moduleNamespaceToPackageName(module);\r
-        val moduleName = parseToClassName(module.name) + postfix;\r
-\r
-        return new GeneratedTypeBuilderImpl(packageName, moduleName);\r
-\r
-    }\r
-\r
+     */
+    private def GeneratedTypeBuilder moduleTypeBuilder(Module module, String postfix) {
+        checkArgument(module !== null, "Module reference cannot be NULL.");
+        val packageName = moduleNamespaceToPackageName(module);
+        val moduleName = parseToClassName(module.name) + postfix;
+        return new GeneratedTypeBuilderImpl(packageName, moduleName);
+    }
+
     /**\r
      * Converts <code>augSchema</code> to list of <code>Type</code> which\r
      * contains generated type for augmentation. In addition there are also\r
@@ -863,174 +688,289 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * @param augSchema\r
      *            AugmentationSchema which is contains data about agumentation\r
      *            (target path, childs...)\r
-     * @return list of <code>Type</code> objects which contains generated type\r
-     *         for augmentation and for container, list and choice child nodes\r
+     * @param module current module\r
+     * @param parentUsesNode parent uses node of this augment (can be null if this augment is not defined under uses statement)\r
      * @throws IllegalArgumentException\r
      *             <ul>\r
      *             <li>if <code>augmentPackageName</code> equals null</li>\r
      *             <li>if <code>augSchema</code> equals null</li>\r
      *             <li>if target path of <code>augSchema</code> equals null</li>\r
      *             </ul>\r
-     */\r
-    private def List<Type> augmentationToGenTypes(String augmentPackageName, AugmentationSchema augSchema) {\r
-        checkArgument(augmentPackageName !== null,"Package Name cannot be NULL.");\r
-        checkArgument(augSchema !== null,"Augmentation Schema cannot be NULL.");\r
-        checkState(augSchema.targetPath !== null,"Augmentation Schema does not contain Target Path (Target Path is NULL).");\r
-        val List<Type> genTypes = new ArrayList();\r
+     */
+    private def void augmentationToGenTypes(String augmentPackageName, AugmentationSchema augSchema, Module module,
+        UsesNode parentUsesNode) {
+        checkArgument(augmentPackageName !== null, "Package Name cannot be NULL.");
+        checkArgument(augSchema !== null, "Augmentation Schema cannot be NULL.");
+        checkState(augSchema.targetPath !== null,
+            "Augmentation Schema does not contain Target Path (Target Path is NULL).");
+
+        processUsesAugments(augSchema, module);
+
         // EVERY augmented interface will extends Augmentation<T> interface\r
-        // and DataObject interface!!!\r
-        val targetPath = augSchema.targetPath;\r
-        val targetSchemaNode = findDataSchemaNode(schemaContext, targetPath);\r
-        var targetType = yangToJavaMapping.get(targetSchemaNode.path);\r
-        if(targetType == null) {\r
-            // FIXME: augmentation should be added as last, all types should already be generated\r
-            // and have assigned Java Types,\r
-            val targetModule = findParentModule(schemaContext, targetSchemaNode);\r
-            val targetBasePackage = moduleNamespaceToPackageName(targetModule);\r
-            val typePackage = packageNameForGeneratedType(targetBasePackage, targetSchemaNode.getPath());\r
-            val targetSchemaNodeName = targetSchemaNode.getQName().getLocalName();\r
-            val typeName = parseToClassName(targetSchemaNodeName);\r
-            targetType = new ReferencedTypeImpl(typePackage,typeName);\r
-        }\r
-        if (targetSchemaNode !== null) {\r
-            val augChildNodes = augSchema.childNodes;\r
-            if (!(targetSchemaNode instanceof ChoiceNode)) {\r
-                val augTypeBuilder = addRawAugmentGenTypeDefinition(augmentPackageName,\r
-                        targetType, augSchema);\r
-                val augType = augTypeBuilder.toInstance();\r
-                genTypes.add(augType);\r
-            } else {\r
-                val choiceTarget = targetSchemaNode as ChoiceNode;\r
-                val choiceCaseNodes = choiceTarget.cases;\r
-                genTypes.addAll(generateTypesFromAugmentedChoiceCases(augmentPackageName, targetType,\r
-                        choiceCaseNodes));\r
-            }\r
-            genTypes.addAll(augmentationBodyToGenTypes(augmentPackageName, augChildNodes));\r
-        }\r
-        return genTypes;\r
-    }\r
-\r
+        // and DataObject interface\r
+        val targetPath = augSchema.targetPath;
+        var targetSchemaNode = findDataSchemaNode(schemaContext, targetPath);
+        if (targetSchemaNode instanceof DataSchemaNode && (targetSchemaNode as DataSchemaNode).isAddedByUses()) {
+            if (parentUsesNode == null) {
+                targetSchemaNode = findOriginal(targetSchemaNode as DataSchemaNode);
+            } else {
+                targetSchemaNode = findOriginalTargetFromGrouping(targetSchemaNode.QName.localName, parentUsesNode);
+            }
+            if (targetSchemaNode == null) {
+                throw new NullPointerException(
+                    "Failed to find target node from grouping for augmentation " + augSchema + " in module " +
+                        module.name);
+            }
+        }
+
+        if (targetSchemaNode !== null) {
+            var targetTypeBuilder = findChildNodeByPath(targetSchemaNode.path)
+            if (targetTypeBuilder === null) {
+                targetTypeBuilder = findCaseByPath(targetSchemaNode.path)
+            }
+            if (targetTypeBuilder === null) {
+                throw new NullPointerException("Target type not yet generated: " + targetSchemaNode);
+            }
+            if (!(targetSchemaNode instanceof ChoiceNode)) {
+                var packageName = augmentPackageName;
+                if (parentUsesNode != null) {
+                    packageName = packageNameForGeneratedType(augmentPackageName, augSchema.targetPath);
+                }
+                val augTypeBuilder = addRawAugmentGenTypeDefinition(module, packageName, augmentPackageName,
+                    targetTypeBuilder.toInstance, augSchema);
+                genCtx.get(module).addAugmentType(augTypeBuilder)
+            } else {
+                generateTypesFromAugmentedChoiceCases(module, augmentPackageName, targetTypeBuilder.toInstance,
+                    targetSchemaNode as ChoiceNode, augSchema.childNodes);
+            }
+        }
+    }
+
+    /**\r
+     * Utility method which search for original node defined in grouping.\r
+     */
+    private def DataSchemaNode findOriginal(DataSchemaNode node) {
+        var DataSchemaNode result = findCorrectTargetFromGrouping(node);
+        if (result == null) {
+            result = findCorrectTargetFromAugment(node);
+            if (result != null) {
+                if (result.addedByUses) {
+                    result = findOriginal(result);
+                }
+            }
+        }
+        return result;
+    }
+
+    private def DataSchemaNode findCorrectTargetFromAugment(DataSchemaNode node) {
+        if (!node.augmenting) {
+            return null;
+        }
+
+        var String currentName = node.QName.localName;
+        var tmpPath = new ArrayList<String>();
+        var YangNode parent = node;
+        var AugmentationSchema augment = null;
+        do {
+            parent = (parent as DataSchemaNode).parent;
+            if (parent instanceof AugmentationTarget) {
+                tmpPath.add(currentName);
+                augment = findNodeInAugment((parent as AugmentationTarget).availableAugmentations, currentName);
+                if (augment == null) {
+                    currentName = (parent as DataSchemaNode).QName.localName;
+                }
+            }
+        } while ((parent as DataSchemaNode).augmenting && augment == null);
+
+        if (augment == null) {
+            return null;
+        } else {
+            Collections.reverse(tmpPath);
+            var Object actualParent = augment;
+            var DataSchemaNode result = null;
+            for (name : tmpPath) {
+                if (actualParent instanceof DataNodeContainer) {
+                    result = (actualParent as DataNodeContainer).getDataChildByName(name);
+                    actualParent = (actualParent as DataNodeContainer).getDataChildByName(name);
+                } else {
+                    if (actualParent instanceof ChoiceNode) {
+                        result = (actualParent as ChoiceNode).getCaseNodeByName(name);
+                        actualParent = (actualParent as ChoiceNode).getCaseNodeByName(name);
+                    }
+                }
+            }
+
+            if (result.addedByUses) {
+                result = findCorrectTargetFromGrouping(result);
+            }
+
+            return result;
+        }
+    }
+
+    private def AugmentationSchema findNodeInAugment(Collection<AugmentationSchema> augments, String name) {
+        for (augment : augments) {
+            if (augment.getDataChildByName(name) != null) {
+                return augment;
+            }
+        }
+        return null;
+    }
+
+    private def DataSchemaNode findCorrectTargetFromGrouping(DataSchemaNode node) {
+        if (node.path.path.size == 1) {
+
+            // uses is under module statement\r
+            val Module m = findParentModule(schemaContext, node);
+            var DataSchemaNode result = null;
+            for (u : m.uses) {
+                var SchemaNode targetGrouping = findNodeInSchemaContext(schemaContext, u.groupingPath.path);
+                if (!(targetGrouping instanceof GroupingDefinition)) {
+                    throw new IllegalArgumentException("Failed to generate code for augment in " + u);
+                }
+                var gr = targetGrouping as GroupingDefinition;
+                result = gr.getDataChildByName(node.QName.localName);
+            }
+            if (result == null) {
+                throw new IllegalArgumentException("Failed to generate code for augment");
+            }
+            return result;
+        } else {
+            var DataSchemaNode result = null;
+            var String currentName = node.QName.localName;
+            var tmpPath = new ArrayList<String>();
+            var YangNode parent = node.parent;
+            do {
+                tmpPath.add(currentName);
+                val dataNodeParent = parent as DataNodeContainer;
+                for (u : dataNodeParent.uses) {
+                    var SchemaNode targetGrouping = findNodeInSchemaContext(schemaContext, u.groupingPath.path);
+                    if (!(targetGrouping instanceof GroupingDefinition)) {
+                        throw new IllegalArgumentException("Failed to generate code for augment in " + u);
+                    }
+                    var gr = targetGrouping as GroupingDefinition;
+                    result = gr.getDataChildByName(currentName);
+                }
+                if (result == null) {
+                    currentName = (parent as SchemaNode).QName.localName;
+                    if (parent instanceof DataSchemaNode) {
+                        parent = (parent as DataSchemaNode).parent;
+                    } else {
+                        parent = (parent as DataNodeContainer).parent;
+                    }
+                }
+            } while (result == null && !(parent instanceof Module));
+
+            if (result != null) {
+                if (tmpPath.size == 1) {
+                    return result;
+                } else {
+                    var DataSchemaNode newParent = result;
+                    Collections.reverse(tmpPath);
+                    tmpPath.remove(0);
+                    for (name : tmpPath) {
+                        newParent = (newParent as DataNodeContainer).getDataChildByName(name);
+                    }
+                    return newParent;
+                }
+            }
+
+            return result;
+        }
+    }
+
+    /**\r
+     * Convenient method to find node added by uses statement.\r
+     */
+    private def DataSchemaNode findOriginalTargetFromGrouping(String targetSchemaNodeName, UsesNode parentUsesNode) {
+        var SchemaNode targetGrouping = findNodeInSchemaContext(schemaContext, parentUsesNode.groupingPath.path);
+        if (!(targetGrouping instanceof GroupingDefinition)) {
+            throw new IllegalArgumentException("Failed to generate code for augment in " + parentUsesNode);
+        }
+
+        var grouping = targetGrouping as GroupingDefinition;
+        var result = grouping.getDataChildByName(targetSchemaNodeName);
+        if (result == null) {
+            return null;
+        }
+        var boolean fromUses = result.addedByUses;
+
+        var Iterator<UsesNode> groupingUses = grouping.uses.iterator;
+        while (fromUses) {
+            if (groupingUses.hasNext()) {
+                grouping = findNodeInSchemaContext(schemaContext, groupingUses.next().groupingPath.path) as GroupingDefinition;
+                result = grouping.getDataChildByName(targetSchemaNodeName);
+                fromUses = result.addedByUses;
+            } else {
+                throw new NullPointerException("Failed to generate code for augment in " + parentUsesNode);
+            }
+        }
+
+        return result;
+    }
+
     /**\r
      * Returns a generated type builder for an augmentation.\r
      *\r
      * The name of the type builder is equal to the name of augmented node with\r
      * serial number as suffix.\r
      *\r
+     * @param module current module\r
      * @param augmentPackageName\r
      *            string with contains the package name to which the augment\r
      *            belongs\r
-     * @param targetPackageName\r
+     * @param basePackageName\r
      *            string with the package name to which the augmented node\r
      *            belongs\r
-     * @param targetSchemaNodeName\r
-     *            string with the name of the augmented node\r
+     * @param targetTypeRef\r
+     *            target type\r
      * @param augSchema\r
      *            augmentation schema which contains data about the child nodes\r
      *            and uses of augment\r
      * @return generated type builder for augment\r
-     */\r
-    private def GeneratedTypeBuilder addRawAugmentGenTypeDefinition( String augmentPackageName,\r
-            Type targetTypeRef, AugmentationSchema augSchema) {\r
-        var Map<String, GeneratedTypeBuilder> augmentBuilders = genTypeBuilders.get(augmentPackageName);\r
-        if (augmentBuilders === null) {\r
-            augmentBuilders = new HashMap();\r
-            genTypeBuilders.put(augmentPackageName, augmentBuilders);\r
-        }\r
-        val augIdentifier = getAugmentIdentifier(augSchema.unknownSchemaNodes);\r
-\r
-        val augTypeName = if (augIdentifier !== null ) { \r
-            parseToClassName(augIdentifier)\r
-        } else {\r
-            augGenTypeName(augmentBuilders, targetTypeRef.name);\r
-        }\r
-        val Set<DataSchemaNode> augChildNodes = augSchema.childNodes;\r
-\r
-        val augTypeBuilder = new GeneratedTypeBuilderImpl(augmentPackageName, augTypeName);\r
-\r
-        augTypeBuilder.addImplementsType(DATA_OBJECT);\r
-        augTypeBuilder.addImplementsType(Types.augmentationTypeFor(targetTypeRef));\r
-        addImplementedInterfaceFromUses(augSchema, augTypeBuilder);\r
-\r
-        augSchemaNodeToMethods(augmentPackageName, augTypeBuilder, augChildNodes);\r
-        augmentBuilders.put(augTypeName, augTypeBuilder);\r
-        return augTypeBuilder;\r
-    }\r
-\r
+     */
+    private def GeneratedTypeBuilder addRawAugmentGenTypeDefinition(Module module, String augmentPackageName,
+        String basePackageName, Type targetTypeRef, AugmentationSchema augSchema) {
+        var Map<String, GeneratedTypeBuilder> augmentBuilders = genTypeBuilders.get(augmentPackageName);
+        if (augmentBuilders === null) {
+            augmentBuilders = new HashMap();
+            genTypeBuilders.put(augmentPackageName, augmentBuilders);
+        }
+        val augIdentifier = getAugmentIdentifier(augSchema.unknownSchemaNodes);
+
+        val augTypeName = if (augIdentifier !== null) {
+                parseToClassName(augIdentifier)
+            } else {
+                augGenTypeName(augmentBuilders, targetTypeRef.name);
+            }
+
+        val augTypeBuilder = new GeneratedTypeBuilderImpl(augmentPackageName, augTypeName);
+
+        augTypeBuilder.addImplementsType(DATA_OBJECT);
+        augTypeBuilder.addImplementsType(Types.augmentationTypeFor(targetTypeRef));
+        addImplementedInterfaceFromUses(augSchema, augTypeBuilder);
+
+        augSchemaNodeToMethods(module, basePackageName, augTypeBuilder, augTypeBuilder, augSchema.childNodes);
+        augmentBuilders.put(augTypeName, augTypeBuilder);
+        return augTypeBuilder;
+    }
+
     /**\r
      *\r
      * @param unknownSchemaNodes\r
-     * @return\r
-     */\r
-    private def String getAugmentIdentifier(List<UnknownSchemaNode> unknownSchemaNodes) {\r
-        for (unknownSchemaNode : unknownSchemaNodes) {\r
-            val nodeType = unknownSchemaNode.nodeType;\r
-            if (AUGMENT_IDENTIFIER_NAME.equals(nodeType.localName)\r
-                    && YANG_EXT_NAMESPACE.equals(nodeType.namespace.toString())) {\r
-                return unknownSchemaNode.nodeParameter;\r
-            }\r
-        }\r
-        return null;\r
-    }\r
-\r
-    /**\r
-     * Convert a container, list and choice subnodes (and recursivelly their\r
-     * subnodes) of augment to generated types\r
-     *\r
-     * @param augBasePackageName\r
-     *            string with the augment package name\r
-     * @param augChildNodes\r
-     *            set of data schema nodes which represents child nodes of the\r
-     *            augment\r
-     *\r
-     * @return list of <code>Type</code> which represents container, list and\r
-     *         choice subnodes of augment\r
-     */\r
-    private def List<Type> augmentationBodyToGenTypes( String augBasePackageName,\r
-            Set<DataSchemaNode> augChildNodes) {\r
-        val List<Type> genTypes = new ArrayList();\r
-        val List<DataNodeIterator> augSchemaIts = new ArrayList();\r
-        for (childNode : augChildNodes) {\r
-            if (childNode instanceof DataNodeContainer) {\r
-                augSchemaIts.add(new DataNodeIterator(childNode as DataNodeContainer));\r
-\r
-                if (childNode instanceof ContainerSchemaNode) {\r
-                    genTypes.add(containerToGenType(augBasePackageName, childNode as ContainerSchemaNode));\r
-                } else if (childNode instanceof ListSchemaNode) {\r
-                    genTypes.addAll(listToGenType(augBasePackageName, childNode as ListSchemaNode));\r
-                }\r
-            } else if (childNode instanceof ChoiceNode) {\r
-                val choice = childNode as ChoiceNode;\r
-                for (caseNode : choice.cases) {\r
-                    augSchemaIts.add(new DataNodeIterator(caseNode));\r
-                }\r
-                genTypes.addAll(choiceToGeneratedType(augBasePackageName, childNode as ChoiceNode));\r
-            }\r
-        }\r
-\r
-        for (it : augSchemaIts) {\r
-            val List<ContainerSchemaNode> augContainers = it.allContainers();\r
-            val List<ListSchemaNode> augLists = it.allLists();\r
-            val List<ChoiceNode> augChoices = it.allChoices();\r
-\r
-            if (augContainers !== null) {\r
-                for (container : augContainers) {\r
-                    genTypes.add(containerToGenType(augBasePackageName, container));\r
-                }\r
-            }\r
-            if (augLists !== null) {\r
-                for (list : augLists) {\r
-                    genTypes.addAll(listToGenType(augBasePackageName, list));\r
-                }\r
-            }\r
-            if (augChoices !== null) {\r
-                for (choice : augChoices) {\r
-                    genTypes.addAll(choiceToGeneratedType(augBasePackageName, choice));\r
-                }\r
-            }\r
-        }\r
-        return genTypes;\r
-    }\r
-\r
+     * @return nodeParameter of UnknownSchemaNode\r
+     */
+    private def String getAugmentIdentifier(List<UnknownSchemaNode> unknownSchemaNodes) {
+        for (unknownSchemaNode : unknownSchemaNodes) {
+            val nodeType = unknownSchemaNode.nodeType;
+            if (AUGMENT_IDENTIFIER_NAME.equals(nodeType.localName) &&
+                YANG_EXT_NAMESPACE.equals(nodeType.namespace.toString())) {
+                return unknownSchemaNode.nodeParameter;
+            }
+        }
+        return null;
+    }
+
     /**\r
      * Returns first unique name for the augment generated type builder. The\r
      * generated type builder name for augment consists from name of augmented\r
@@ -1042,41 +982,15 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * @param genTypeName\r
      *            string with name of augmented node\r
      * @return string with unique name for augmentation builder\r
-     */\r
-    private def String augGenTypeName( Map<String, GeneratedTypeBuilder> builders, String genTypeName) {\r
-        var index = 1;\r
-        while ((builders !== null) && builders.containsKey(genTypeName + index)) {\r
-            index = index + 1;\r
-        }\r
-        return genTypeName + index;\r
-    }\r
-\r
-    /**\r
-     * Converts <code>containerNode</code> to generated type. Firstly the\r
-     * generated type builder is created. The subnodes of\r
-     * <code>containerNode</code> are added as methods and the instance of\r
-     * <code>GeneratedType</code> is returned.\r
-     *\r
-     * @param basePackageName\r
-     *            string contains the module package name\r
-     * @param containerNode\r
-     *            container schema node with the data about childs nodes and\r
-     *            schema paths\r
-     * @return generated type for <code>containerNode</code>\r
-     */\r
-    private def GeneratedType containerToGenType( String basePackageName, ContainerSchemaNode containerNode) {\r
-        if (containerNode === null) {\r
-            return null;\r
-        }\r
-\r
-        val packageName = packageNameForGeneratedType(basePackageName, containerNode.path);\r
-        val schemaNodes = containerNode.childNodes;\r
-        val typeBuilder = addDefaultInterfaceDefinition(packageName, containerNode);\r
-\r
-        resolveDataSchemaNodes(basePackageName, typeBuilder, schemaNodes);\r
-        return typeBuilder.toInstance();\r
-    }\r
-\r
+     */
+    private def String augGenTypeName(Map<String, GeneratedTypeBuilder> builders, String genTypeName) {
+        var index = 1;
+        while ((builders !== null) && builders.containsKey(genTypeName + index)) {
+            index = index + 1;
+        }
+        return genTypeName + index;
+    }
+
     /**\r
      * Adds the methods to <code>typeBuilder</code> which represent subnodes of\r
      * node for which <code>typeBuilder</code> was created.\r
@@ -1084,37 +998,39 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * The subnodes aren't mapped to the methods if they are part of grouping or\r
      * augment (in this case are already part of them).\r
      *\r
+     * @param module current module\r
      * @param basePackageName\r
      *            string contains the module package name\r
-     * @param typeBuilder\r
+     * @param parent\r
      *            generated type builder which represents any node. The subnodes\r
      *            of this node are added to the <code>typeBuilder</code> as\r
      *            methods. The subnode can be of type leaf, leaf-list, list,\r
      *            container, choice.\r
+     * @param childOf parent type\r
      * @param schemaNodes\r
      *            set of data schema nodes which are the children of the node\r
      *            for which <code>typeBuilder</code> was created\r
      * @return generated type builder which is the same builder as input\r
      *         parameter. The getter methods (representing child nodes) could be\r
      *         added to it.\r
-     */\r
-    private def GeneratedTypeBuilder resolveDataSchemaNodes( String basePackageName,\r
-            GeneratedTypeBuilder typeBuilder, Set<DataSchemaNode> schemaNodes) {\r
-        if ((schemaNodes !== null) && (typeBuilder !== null)) {\r
-            for (schemaNode : schemaNodes) {\r
-                if (!schemaNode.isAugmenting() && !schemaNode.isAddedByUses()) {\r
-                    addSchemaNodeToBuilderAsMethod(basePackageName, schemaNode, typeBuilder);\r
-                }\r
-                \r
-            }\r
-        }\r
-        return typeBuilder;\r
-    }\r
-\r
+     */
+    private def GeneratedTypeBuilder resolveDataSchemaNodes(Module module, String basePackageName,
+        GeneratedTypeBuilder parent, GeneratedTypeBuilder childOf, Set<DataSchemaNode> schemaNodes) {
+        if ((schemaNodes !== null) && (parent !== null)) {
+            for (schemaNode : schemaNodes) {
+                if (!schemaNode.augmenting && !schemaNode.addedByUses) {
+                    addSchemaNodeToBuilderAsMethod(basePackageName, schemaNode, parent, childOf, module);
+                }
+            }
+        }
+        return parent;
+    }
+
     /**\r
      * Adds the methods to <code>typeBuilder</code> what represents subnodes of\r
      * node for which <code>typeBuilder</code> was created.\r
      *\r
+     * @param module current module\r
      * @param basePackageName\r
      *            string contains the module package name\r
      * @param typeBuilder\r
@@ -1122,90 +1038,59 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *            of this node are added to the <code>typeBuilder</code> as\r
      *            methods. The subnode can be of type leaf, leaf-list, list,\r
      *            container, choice.\r
+     * @param childOf parent type\r
      * @param schemaNodes\r
      *            set of data schema nodes which are the children of the node\r
      *            for which <code>typeBuilder</code> was created\r
      * @return generated type builder which is the same object as the input\r
      *         parameter <code>typeBuilder</code>. The getter method could be\r
      *         added to it.\r
-     */\r
-    private def GeneratedTypeBuilder augSchemaNodeToMethods( String basePackageName,\r
-             GeneratedTypeBuilder typeBuilder,  Set<DataSchemaNode> schemaNodes) {\r
-        if ((schemaNodes !== null) && (typeBuilder !== null)) {\r
-            for (schemaNode : schemaNodes) {\r
-                if (schemaNode.isAugmenting()) {\r
-                    addSchemaNodeToBuilderAsMethod(basePackageName, schemaNode, typeBuilder);\r
-                }\r
-            }\r
-        }\r
-        return typeBuilder;\r
-    }\r
-\r
+     */
+    private def GeneratedTypeBuilder augSchemaNodeToMethods(Module module, String basePackageName,
+        GeneratedTypeBuilder typeBuilder, GeneratedTypeBuilder childOf, Set<DataSchemaNode> schemaNodes) {
+        if ((schemaNodes !== null) && (typeBuilder !== null)) {
+            for (schemaNode : schemaNodes) {
+                if (!schemaNode.isAugmenting()) {
+                    addSchemaNodeToBuilderAsMethod(basePackageName, schemaNode, typeBuilder, childOf, module);
+                }
+            }
+        }
+        return typeBuilder;
+    }
+
     /**\r
      * Adds to <code>typeBuilder</code> a method which is derived from\r
      * <code>schemaNode</code>.\r
      *\r
      * @param basePackageName\r
      *            string with the module package name\r
-     * @param schemaNode\r
+     * @param node\r
      *            data schema node which is added to <code>typeBuilder</code> as\r
      *            a method\r
      * @param typeBuilder\r
      *            generated type builder to which is <code>schemaNode</code>\r
      *            added as a method.\r
-     */\r
-    private def void addSchemaNodeToBuilderAsMethod( String basePackageName,  DataSchemaNode node,\r
-             GeneratedTypeBuilder typeBuilder) {\r
-        if (node !== null && typeBuilder !== null) {\r
-            switch(node) {\r
-                case node instanceof LeafSchemaNode: resolveLeafSchemaNodeAsMethod(typeBuilder, node as LeafSchemaNode)\r
-                case node instanceof LeafListSchemaNode: resolveLeafListSchemaNode(typeBuilder, node as LeafListSchemaNode)\r
-                case node instanceof ContainerSchemaNode: resolveContainerSchemaNode(basePackageName, typeBuilder, node as ContainerSchemaNode)\r
-                case node instanceof ListSchemaNode: resolveListSchemaNode(basePackageName, typeBuilder, node as ListSchemaNode)\r
-                case node instanceof ChoiceNode: resolveChoiceSchemaNode(basePackageName, typeBuilder, node as ChoiceNode)\r
-            }\r
-        }\r
-    }\r
-\r
-    /**\r
-     * Creates a getter method for a choice node.\r
-     *\r
-     * Firstly generated type builder for choice is created or found in\r
-     * {@link BindingGeneratorImpl#allGroupings allGroupings}. The package name\r
-     * in the builder is created as concatenation of module package name and\r
-     * names of all parent nodes. In the end the getter method for choice is\r
-     * added to <code>typeBuilder</code> and return type is set to choice\r
-     * builder.\r
-     *\r
-     * @param basePackageName\r
-     *            string with the module package name\r
-     * @param typeBuilder\r
-     *            generated type builder to which is <code>choiceNode</code>\r
-     *            added as getter method\r
-     * @param choiceNode\r
-     *            choice node which is mapped as a getter method\r
-     * @throws IllegalArgumentException\r
-     *             <ul>\r
-     *             <li>if <code>basePackageName</code> equals null</li>\r
-     *             <li>if <code>typeBuilder</code> equals null</li>\r
-     *             <li>if <code>choiceNode</code> equals null</li>\r
-     *             </ul>\r
-     *\r
-     */\r
-    private def void resolveChoiceSchemaNode( String basePackageName,  GeneratedTypeBuilder typeBuilder,\r
-             ChoiceNode choiceNode) {\r
-        checkArgument(basePackageName !== null,"Base Package Name cannot be NULL.");\r
-        checkArgument(typeBuilder !== null,"Generated Type Builder cannot be NULL.");\r
-        checkArgument(choiceNode !== null,"Choice Schema Node cannot be NULL.");\r
-\r
-        val choiceName = choiceNode.QName.localName;\r
-        if (choiceName !== null && !choiceNode.isAddedByUses()) {\r
-            val packageName = packageNameForGeneratedType(basePackageName, choiceNode.path);\r
-            val choiceType = addDefaultInterfaceDefinition(packageName, choiceNode);\r
-            constructGetter(typeBuilder, choiceName, choiceNode.description, choiceType);\r
-        }\r
-    }\r
-\r
+     * @param childOf parent type\r
+     * @param module current module\r
+     */
+    private def void addSchemaNodeToBuilderAsMethod(String basePackageName, DataSchemaNode node,
+        GeneratedTypeBuilder typeBuilder, GeneratedTypeBuilder childOf, Module module) {
+        if (node !== null && typeBuilder !== null) {
+            switch (node) {
+                case node instanceof LeafSchemaNode:
+                    resolveLeafSchemaNodeAsMethod(typeBuilder, node as LeafSchemaNode)
+                case node instanceof LeafListSchemaNode:
+                    resolveLeafListSchemaNode(typeBuilder, node as LeafListSchemaNode)
+                case node instanceof ContainerSchemaNode:
+                    containerToGenType(module, basePackageName, typeBuilder, childOf, node as ContainerSchemaNode)
+                case node instanceof ListSchemaNode:
+                    listToGenType(module, basePackageName, typeBuilder, childOf, node as ListSchemaNode)
+                case node instanceof ChoiceNode:
+                    choiceToGeneratedType(module, basePackageName, typeBuilder, node as ChoiceNode)
+            }
+        }
+    }
+
     /**\r
      * Converts <code>choiceNode</code> to the list of generated types for\r
      * choice and its cases.\r
@@ -1214,39 +1099,34 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * concatenation of the module package (<code>basePackageName</code>) and\r
      * names of all parents node.\r
      *\r
+     * @param module current module\r
      * @param basePackageName\r
      *            string with the module package name\r
+     * @param parent parent type\r
+     * @param childOf concrete parent for case child nodes\r
      * @param choiceNode\r
      *            choice node which is mapped to generated type. Also child\r
      *            nodes - cases are mapped to generated types.\r
-     * @return list of generated types which contains generated type for choice\r
-     *         and generated types for all cases which aren't added do choice\r
-     *         through <i>uses</i>.\r
      * @throws IllegalArgumentException\r
      *             <ul>\r
      *             <li>if <code>basePackageName</code> equals null</li>\r
      *             <li>if <code>choiceNode</code> equals null</li>\r
      *             </ul>\r
      *\r
-     */\r
-    private def List<GeneratedType> choiceToGeneratedType( String basePackageName,  ChoiceNode choiceNode) {\r
-        checkArgument(basePackageName !== null,"Base Package Name cannot be NULL.");\r
-        checkArgument(choiceNode !== null,"Choice Schema Node cannot be NULL.");\r
-\r
-        val List<GeneratedType> generatedTypes = new ArrayList();\r
-        val packageName = packageNameForGeneratedType(basePackageName, choiceNode.path);\r
-        val choiceTypeBuilder = addRawInterfaceDefinition(packageName, choiceNode);\r
-        //choiceTypeBuilder.addImplementsType(DATA_OBJECT);\r
-        val choiceType = choiceTypeBuilder.toInstance();\r
-\r
-        generatedTypes.add(choiceType);\r
-        val Set<ChoiceCaseNode> caseNodes = choiceNode.cases;\r
-        if ((caseNodes !== null) && !caseNodes.isEmpty()) {\r
-            generatedTypes.addAll(generateTypesFromChoiceCases(basePackageName, choiceType, caseNodes));\r
-        }\r
-        return generatedTypes;\r
-    }\r
-\r
+     */
+    private def void choiceToGeneratedType(Module module, String basePackageName, GeneratedTypeBuilder parent,
+        ChoiceNode choiceNode) {
+        checkArgument(basePackageName !== null, "Base Package Name cannot be NULL.");
+        checkArgument(choiceNode !== null, "Choice Schema Node cannot be NULL.");
+
+        val packageName = packageNameForGeneratedType(basePackageName, choiceNode.path);
+        val choiceTypeBuilder = addRawInterfaceDefinition(packageName, choiceNode);
+        constructGetter(parent, choiceNode.QName.localName, choiceNode.description, choiceTypeBuilder);
+        choiceTypeBuilder.addImplementsType(DataContainer.typeForClass);
+        genCtx.get(module).addChildNodeType(choiceNode.path, choiceTypeBuilder)
+        generateTypesFromChoiceCases(module, basePackageName, parent, choiceTypeBuilder.toInstance, choiceNode);
+    }
+
     /**\r
      * Converts <code>caseNodes</code> set to list of corresponding generated\r
      * types.\r
@@ -1272,31 +1152,54 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *             <li>if <code>caseNodes</code> equals null</li>\r
      *             </ul>\r
      *             *\r
-     */\r
-    private def List<GeneratedType> generateTypesFromChoiceCases( String basePackageName,  Type refChoiceType,\r
-             Set<ChoiceCaseNode> caseNodes) {\r
-        checkArgument(basePackageName !== null,"Base Package Name cannot be NULL.");\r
-        checkArgument(refChoiceType !== null,"Referenced Choice Type cannot be NULL.");\r
-        checkArgument(caseNodes !== null,"Set of Choice Case Nodes cannot be NULL.");\r
-\r
-        val List<GeneratedType> generatedTypes = new ArrayList();\r
-        for (caseNode : caseNodes) {\r
-            if (caseNode !== null && !caseNode.isAddedByUses() && !caseNode.isAugmenting()) {\r
-                val packageName = packageNameForGeneratedType(basePackageName, caseNode.path);\r
-                val caseTypeBuilder = addDefaultInterfaceDefinition(packageName, caseNode);\r
-                caseTypeBuilder.addImplementsType(refChoiceType);\r
-\r
-                val Set<DataSchemaNode> childNodes = caseNode.childNodes;\r
-                if (childNodes !== null) {\r
-                    resolveDataSchemaNodes(basePackageName, caseTypeBuilder, childNodes);\r
-                }\r
-                generatedTypes.add(caseTypeBuilder.toInstance());\r
-            }\r
-        }\r
-\r
-        return generatedTypes;\r
-    }\r
-\r
+     */
+    private def void generateTypesFromChoiceCases(Module module, String basePackageName,
+        GeneratedTypeBuilder choiceParent, Type refChoiceType, ChoiceNode choiceNode) {
+        checkArgument(basePackageName !== null, "Base Package Name cannot be NULL.");
+        checkArgument(refChoiceType !== null, "Referenced Choice Type cannot be NULL.");
+        checkArgument(choiceNode !== null, "ChoiceNode cannot be NULL.");
+
+        val Set<ChoiceCaseNode> caseNodes = choiceNode.cases;
+        if (caseNodes == null) {
+            return
+        }
+
+        for (caseNode : caseNodes) {
+            if (caseNode !== null && !caseNode.isAddedByUses() && !caseNode.isAugmenting()) {
+                val packageName = packageNameForGeneratedType(basePackageName, caseNode.path);
+                val caseTypeBuilder = addDefaultInterfaceDefinition(packageName, caseNode);
+                caseTypeBuilder.addImplementsType(refChoiceType);
+                genCtx.get(module).addCaseType(caseNode.path, caseTypeBuilder)
+                val Set<DataSchemaNode> caseChildNodes = caseNode.childNodes;
+                if (caseChildNodes !== null) {
+                    val parentNode = choiceNode.parent;
+                    var SchemaNode parent;
+                    if (parentNode instanceof AugmentationSchema) {
+                        val augSchema = parentNode as AugmentationSchema;
+                        val targetPath = augSchema.targetPath;
+                        var targetSchemaNode = findDataSchemaNode(schemaContext, targetPath);
+                        if (targetSchemaNode instanceof DataSchemaNode &&
+                            (targetSchemaNode as DataSchemaNode).isAddedByUses()) {
+                            targetSchemaNode = findOriginal(targetSchemaNode as DataSchemaNode);
+                            if (targetSchemaNode == null) {
+                                throw new NullPointerException(
+                                    "Failed to find target node from grouping for augmentation " + augSchema +
+                                        " in module " + module.name);
+                            }
+                        }
+                        parent = targetSchemaNode as SchemaNode
+                    } else {
+                        parent = choiceNode.parent as SchemaNode;
+                    }
+                    var GeneratedTypeBuilder childOfType = findChildNodeByPath(parent.path)
+                    resolveDataSchemaNodes(module, basePackageName, caseTypeBuilder, childOfType, caseChildNodes);
+                }
+            }
+
+            processUsesAugments(caseNode, module);
+        }
+    }
+
     /**\r
      * Generates list of generated types for all the cases of a choice which are\r
      * added to the choice through the augment.\r
@@ -1321,31 +1224,55 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *             <li>if <code>refChoiceType</code> equals null</li>\r
      *             <li>if <code>caseNodes</code> equals null</li>\r
      *             </ul>\r
-     */\r
-    private def List<GeneratedType> generateTypesFromAugmentedChoiceCases( String basePackageName,\r
-             Type refChoiceType,  Set<ChoiceCaseNode> caseNodes) {\r
-        checkArgument(basePackageName !== null,"Base Package Name cannot be NULL.");\r
-        checkArgument(refChoiceType !== null,"Referenced Choice Type cannot be NULL.");\r
-        checkArgument(caseNodes !== null,"Set of Choice Case Nodes cannot be NULL.");\r
-\r
-        val List<GeneratedType> generatedTypes = new ArrayList();\r
-        for (caseNode : caseNodes) {\r
-            if (caseNode !== null && caseNode.isAugmenting()) {\r
-                val packageName = packageNameForGeneratedType(basePackageName, caseNode.path);\r
-                val caseTypeBuilder = addDefaultInterfaceDefinition(packageName, caseNode);\r
-                caseTypeBuilder.addImplementsType(refChoiceType);\r
-\r
-                val Set<DataSchemaNode> childNodes = caseNode.childNodes;\r
-                if (childNodes !== null) {\r
-                    resolveDataSchemaNodes(basePackageName, caseTypeBuilder, childNodes);\r
-                }\r
-                generatedTypes.add(caseTypeBuilder.toInstance());\r
-            }\r
-        }\r
-\r
-        return generatedTypes;\r
-    }\r
-\r
+     */
+    private def void generateTypesFromAugmentedChoiceCases(Module module, String basePackageName, Type targetType,
+        ChoiceNode targetNode, Set<DataSchemaNode> augmentedNodes) {
+        checkArgument(basePackageName !== null, "Base Package Name cannot be NULL.");
+        checkArgument(targetType !== null, "Referenced Choice Type cannot be NULL.");
+        checkArgument(augmentedNodes !== null, "Set of Choice Case Nodes cannot be NULL.");
+
+        for (caseNode : augmentedNodes) {
+            if (caseNode !== null) {
+                val packageName = packageNameForGeneratedType(basePackageName, caseNode.path);
+                val caseTypeBuilder = addDefaultInterfaceDefinition(packageName, caseNode);
+                caseTypeBuilder.addImplementsType(targetType);
+
+                val SchemaNode parent = targetNode.parent as SchemaNode;
+                var GeneratedTypeBuilder childOfType = null;
+                if (parent instanceof Module) {
+                    childOfType = genCtx.get(parent as Module).moduleNode
+                } else if (parent instanceof ChoiceCaseNode) {
+                    childOfType = findCaseByPath(parent.path)
+                } else if (parent instanceof DataSchemaNode || parent instanceof NotificationDefinition) {
+                    childOfType = findChildNodeByPath(parent.path)
+                } else if (parent instanceof GroupingDefinition) {
+                    childOfType = findGroupingByPath(parent.path);
+                }
+
+                if (childOfType == null) {
+                    throw new IllegalArgumentException("Failed to find parent type of choice " + targetNode);
+                }
+
+                if (caseNode instanceof DataNodeContainer) {
+                    val DataNodeContainer dataNodeCase = caseNode as DataNodeContainer;
+                    val Set<DataSchemaNode> childNodes = dataNodeCase.childNodes;
+                    if (childNodes !== null) {
+                        resolveDataSchemaNodes(module, basePackageName, caseTypeBuilder, childOfType, childNodes);
+                    }
+                } else {
+                    val ChoiceCaseNode node = targetNode.getCaseNodeByName(caseNode.getQName().getLocalName());
+                    val Set<DataSchemaNode> childNodes = node.childNodes;
+                    if (childNodes !== null) {
+                        resolveDataSchemaNodes(module, basePackageName, caseTypeBuilder, childOfType, childNodes);
+                    }
+                }
+
+                genCtx.get(module).addCaseType(caseNode.path, caseTypeBuilder)
+            }
+        }
+
+    }
+
     /**\r
      * Converts <code>leaf</code> to the getter method which is added to\r
      * <code>typeBuilder</code>.\r
@@ -1362,52 +1289,108 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *         null</li>\r
      *         <li>true - in other cases</li>\r
      *         </ul>\r
-     */\r
-    private def boolean resolveLeafSchemaNodeAsMethod( GeneratedTypeBuilder typeBuilder,  LeafSchemaNode leaf) {\r
-        if ((leaf !== null) && (typeBuilder !== null)) {\r
-            val leafName = leaf.QName.localName;\r
-            var String leafDesc = leaf.description;\r
-            if (leafDesc === null) {\r
-                leafDesc = "";\r
-            }\r
-\r
-            val parentModule = findParentModule(schemaContext, leaf);\r
-            if (leafName !== null && !leaf.isAddedByUses()) {\r
-                val TypeDefinition<?> typeDef = leaf.type;\r
-\r
-                var Type returnType = null;\r
-                if (typeDef instanceof EnumTypeDefinition) {\r
-                    returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf);\r
-                    val enumTypeDef = enumTypeDefFromExtendedType(typeDef);\r
-                    val enumBuilder = resolveInnerEnumFromTypeDefinition(enumTypeDef, leafName,\r
-                            typeBuilder);\r
-\r
-                    if (enumBuilder !== null) {\r
-                        returnType = new ReferencedTypeImpl(enumBuilder.packageName, enumBuilder.name);\r
-                    }\r
-                    (typeProvider as TypeProviderImpl).putReferencedType(leaf.path, returnType);\r
-                } else if (typeDef instanceof UnionType) {\r
-                    val genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, leafName, leaf, parentModule);\r
-                    if (genTOBuilder !== null) {\r
-                        returnType = new ReferencedTypeImpl(genTOBuilder.packageName, genTOBuilder.name);\r
-                    }\r
-                } else if (typeDef instanceof BitsTypeDefinition) {\r
-                    val genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, leafName, leaf, parentModule);\r
-                    if (genTOBuilder !== null) {\r
-                        returnType = new ReferencedTypeImpl(genTOBuilder.packageName, genTOBuilder.name);\r
-                    }\r
-                } else {\r
-                    returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf);\r
-                }\r
-                if (returnType !== null) {\r
-                    constructGetter(typeBuilder, leafName, leafDesc, returnType);\r
-                    return true;\r
-                }\r
-            }\r
-        }\r
-        return false;\r
-    }\r
-\r
+     */
+    private def boolean resolveLeafSchemaNodeAsMethod(GeneratedTypeBuilder typeBuilder, LeafSchemaNode leaf) {
+        if ((leaf !== null) && (typeBuilder !== null)) {
+            val leafName = leaf.QName.localName;
+            var String leafDesc = leaf.description;
+            if (leafDesc === null) {
+                leafDesc = "";
+            }
+
+            val parentModule = findParentModule(schemaContext, leaf);
+            if (leafName !== null && !leaf.isAddedByUses()) {
+                val TypeDefinition<?> typeDef = leaf.type;
+
+                var Type returnType = null;
+                if (typeDef instanceof EnumTypeDefinition) {
+                    returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf);
+                    val enumTypeDef = typeDef as EnumTypeDefinition;
+                    val enumBuilder = resolveInnerEnumFromTypeDefinition(enumTypeDef, leafName, typeBuilder);
+
+                    if (enumBuilder !== null) {
+                        returnType = new ReferencedTypeImpl(enumBuilder.packageName, enumBuilder.name);
+                    }
+                    (typeProvider as TypeProviderImpl).putReferencedType(leaf.path, returnType);
+                } else if (typeDef instanceof UnionType) {
+                    val genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, leafName, leaf, parentModule);
+                    if (genTOBuilder !== null) {
+                        returnType = new ReferencedTypeImpl(genTOBuilder.packageName, genTOBuilder.name);
+                    }
+                } else if (typeDef instanceof BitsTypeDefinition) {
+                    val genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, leafName, leaf, parentModule);
+                    if (genTOBuilder !== null) {
+                        returnType = new ReferencedTypeImpl(genTOBuilder.packageName, genTOBuilder.name);
+                    }
+                } else {
+                    returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf);
+                }
+                if (returnType !== null) {
+                    val MethodSignatureBuilder getter = constructGetter(typeBuilder, leafName, leafDesc, returnType);
+                    processContextRefExtension(leaf, getter, parentModule);
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private def void processContextRefExtension(LeafSchemaNode leaf, MethodSignatureBuilder getter, Module module) {
+        for (node : leaf.unknownSchemaNodes) {
+            val nodeType = node.nodeType;
+            if ("context-reference".equals(nodeType.localName)) {
+                val nodeParam = node.nodeParameter;
+                var IdentitySchemaNode identity = null;
+                var String basePackageName = null;
+                val String[] splittedElement = nodeParam.split(":");
+                if (splittedElement.length == 1) {
+                    identity = findIdentityByName(module.identities, splittedElement.get(0));
+                    basePackageName = moduleNamespaceToPackageName(module);
+                } else if (splittedElement.length == 2) {
+                    var prefix = splittedElement.get(0);
+                    val Module dependentModule = findModuleFromImports(module.imports, prefix)
+                    if (dependentModule == null) {
+                        throw new IllegalArgumentException(
+                            "Failed to process context-reference: unknown prefix " + prefix);
+                    }
+                    identity = findIdentityByName(dependentModule.identities, splittedElement.get(1));
+                    basePackageName = moduleNamespaceToPackageName(dependentModule);
+                } else {
+                    throw new IllegalArgumentException(
+                        "Failed to process context-reference: unknown identity " + nodeParam);
+                }
+                if (identity == null) {
+                    throw new IllegalArgumentException(
+                        "Failed to process context-reference: unknown identity " + nodeParam);
+                }
+
+                val Class<RoutingContext> clazz = typeof(RoutingContext);
+                val AnnotationTypeBuilder rc = getter.addAnnotation(clazz.package.name, clazz.simpleName);
+                val packageName = packageNameForGeneratedType(basePackageName, identity.path);
+                val genTypeName = parseToClassName(identity.QName.localName);
+                rc.addParameter("value", packageName + "." + genTypeName + ".class");
+            }
+        }
+    }
+
+    private def IdentitySchemaNode findIdentityByName(Set<IdentitySchemaNode> identities, String name) {
+        for (id : identities) {
+            if (id.QName.localName.equals(name)) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    private def Module findModuleFromImports(Set<ModuleImport> imports, String prefix) {
+        for (imp : imports) {
+            if (imp.prefix.equals(prefix)) {
+                return schemaContext.findModuleByName(imp.moduleName, imp.revision);
+            }
+        }
+        return null;
+    }
+
     /**\r
      * Converts <code>leaf</code> schema node to property of generated TO\r
      * builder.\r
@@ -1426,40 +1409,40 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *         name equals null or if leaf is added by <i>uses</i>.</li>\r
      *         <li>true - other cases</li>\r
      *         </ul>\r
-     */\r
-    private def boolean resolveLeafSchemaNodeAsProperty( GeneratedTOBuilder toBuilder, LeafSchemaNode leaf,\r
-            boolean isReadOnly) {\r
-        if ((leaf !== null) && (toBuilder !== null)) {\r
-            val leafName = leaf.QName.localName;\r
-            var String leafDesc = leaf.description;\r
-            if (leafDesc === null) {\r
-                leafDesc = "";\r
-            }\r
-\r
-            if (leafName !== null && !leaf.isAddedByUses()) {\r
-                val TypeDefinition<?> typeDef = leaf.type;\r
-\r
+     */
+    private def boolean resolveLeafSchemaNodeAsProperty(GeneratedTOBuilder toBuilder, LeafSchemaNode leaf,
+        boolean isReadOnly) {
+        if ((leaf !== null) && (toBuilder !== null)) {
+            val leafName = leaf.QName.localName;
+            var String leafDesc = leaf.description;
+            if (leafDesc === null) {
+                leafDesc = "";
+            }
+
+            if (leafName !== null) {
+                val TypeDefinition<?> typeDef = leaf.type;
+
                 // TODO: properly resolve enum types\r
-                val returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf);\r
-\r
-                if (returnType !== null) {\r
-                    val propBuilder = toBuilder.addProperty(parseToClassName(leafName));\r
-\r
-                    propBuilder.setReadOnly(isReadOnly);\r
-                    propBuilder.setReturnType(returnType);\r
-                    propBuilder.setComment(leafDesc);\r
-\r
-                    toBuilder.addEqualsIdentity(propBuilder);\r
-                    toBuilder.addHashIdentity(propBuilder);\r
-                    toBuilder.addToStringProperty(propBuilder);\r
-\r
-                    return true;\r
-                }\r
-            }\r
-        }\r
-        return false;\r
-    }\r
-\r
+                val returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf);
+
+                if (returnType !== null) {
+                    val propBuilder = toBuilder.addProperty(parseToClassName(leafName));
+
+                    propBuilder.setReadOnly(isReadOnly);
+                    propBuilder.setReturnType(returnType);
+                    propBuilder.setComment(leafDesc);
+
+                    toBuilder.addEqualsIdentity(propBuilder);
+                    toBuilder.addHashIdentity(propBuilder);
+                    toBuilder.addToStringProperty(propBuilder);
+
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     /**\r
      * Converts <code>node</code> leaf list schema node to getter method of\r
      * <code>typeBuilder</code>.\r
@@ -1476,109 +1459,28 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *         nodeName equal null or <code>node</code> is added by <i>uses</i></li>\r
      *         <li>false - other cases</li>\r
      *         </ul>\r
-     */\r
-    private def boolean resolveLeafListSchemaNode( GeneratedTypeBuilder typeBuilder, LeafListSchemaNode node) {\r
-        if ((node !== null) && (typeBuilder !== null)) {\r
-            val nodeName = node.QName.localName;\r
-            var String nodeDesc = node.description;\r
-            if (nodeDesc === null) {\r
-                nodeDesc = "";\r
-            }\r
-\r
-            if (nodeName !== null && !node.isAddedByUses()) {\r
-                val TypeDefinition<?> type = node.type;\r
-                val listType = Types.listTypeFor(typeProvider.javaTypeForSchemaDefinitionType(type, node));\r
-\r
-                constructGetter(typeBuilder, nodeName, nodeDesc, listType);\r
-                return true;\r
-            }\r
-        }\r
-        return false;\r
-    }\r
-\r
-    /**\r
-     * Creates a getter method for a container node.\r
-     *\r
-     * Firstly generated type builder for container is created or found in\r
-     * {@link BindingGeneratorImpl#allGroupings allGroupings}. The package name\r
-     * in the builder is created as concatenation of module package name and\r
-     * names of all parent nodes. In the end the getter method for container is\r
-     * added to <code>typeBuilder</code> and return type is set to container\r
-     * type builder.\r
-     *\r
-     * @param basePackageName\r
-     *            string with the module package name\r
-     * @param typeBuilder\r
-     *            generated type builder to which is <code>containerNode</code>\r
-     *            added as getter method\r
-     * @param containerNode\r
-     *            container schema node which is mapped as getter method to\r
-     *            <code>typeBuilder</code>\r
-     * @return boolean value\r
-     *         <ul>\r
-     *         <li>false - if <code>containerNode</code>,\r
-     *         <code>typeBuilder</code>, container node name equal null or\r
-     *         <code>containerNode</code> is added by uses</li>\r
-     *         <li>true - other cases</li>\r
-     *         </ul>\r
-     */\r
-    private def boolean resolveContainerSchemaNode( String basePackageName, GeneratedTypeBuilder typeBuilder,\r
-            ContainerSchemaNode containerNode) {\r
-        if ((containerNode !== null) && (typeBuilder !== null)) {\r
-            val nodeName = containerNode.QName.localName;\r
-\r
-            if (nodeName !== null && !containerNode.isAddedByUses()) {\r
-                val packageName = packageNameForGeneratedType(basePackageName, containerNode.path);\r
-\r
-                val rawGenType = addDefaultInterfaceDefinition(packageName, containerNode);\r
-                constructGetter(typeBuilder, nodeName, containerNode.description, rawGenType);\r
-\r
-                return true;\r
-            }\r
-        }\r
-        return false;\r
-    }\r
-\r
-    /**\r
-     * Creates a getter method for a list node.\r
-     *\r
-     * Firstly generated type builder for list is created or found in\r
-     * {@link BindingGeneratorImpl#allGroupings allGroupings}. The package name\r
-     * in the builder is created as concatenation of module package name and\r
-     * names of all parent nodes. In the end the getter method for list is added\r
-     * to <code>typeBuilder</code> and return type is set to list type builder.\r
-     *\r
-     * @param basePackageName\r
-     *            string with the module package name\r
-     * @param typeBuilder\r
-     *            generated type builder to which is <code></code> added as\r
-     *            getter method\r
-     * @param listNode\r
-     *            list schema node which is mapped as getter method to\r
-     *            <code>typeBuilder</code>\r
-     * @return boolean value\r
-     *         <ul>\r
-     *         <li>false - if <code>listNode</code>, <code>typeBuilder</code>,\r
-     *         list node name equal null or <code>listNode</code> is added by\r
-     *         uses</li>\r
-     *         <li>true - other cases</li>\r
-     *         </ul>\r
-     */\r
-    private def boolean resolveListSchemaNode( String basePackageName, GeneratedTypeBuilder typeBuilder,\r
-            ListSchemaNode listNode) {\r
-        if ((listNode !== null) && (typeBuilder !== null)) {\r
-            val listName = listNode.QName.localName;\r
-\r
-            if (listName !== null && !listNode.isAddedByUses()) {\r
-                val packageName = packageNameForGeneratedType(basePackageName, listNode.path);\r
-                val rawGenType = addDefaultInterfaceDefinition(packageName, listNode);\r
-                constructGetter(typeBuilder, listName, listNode.description, Types.listTypeFor(rawGenType));\r
-                return true;\r
-            }\r
-        }\r
-        return false;\r
-    }\r
-\r
+     */
+    private def boolean resolveLeafListSchemaNode(GeneratedTypeBuilder typeBuilder, LeafListSchemaNode node) {
+        if ((node !== null) && (typeBuilder !== null)) {
+            val nodeName = node.QName.localName;
+            var String nodeDesc = node.description;
+            if (nodeDesc === null) {
+                nodeDesc = "";
+            }
+            if (nodeName !== null && !node.isAddedByUses()) {
+                val TypeDefinition<?> type = node.type;
+                val listType = Types.listTypeFor(typeProvider.javaTypeForSchemaDefinitionType(type, node));
+                constructGetter(typeBuilder, nodeName, nodeDesc, listType);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private def GeneratedTypeBuilder addDefaultInterfaceDefinition(String packageName, SchemaNode schemaNode) {
+        return addDefaultInterfaceDefinition(packageName, schemaNode, null);
+    }
+
     /**\r
      * Instantiates generated type builder with <code>packageName</code> and\r
      * <code>schemaNode</code>.\r
@@ -1598,22 +1500,28 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *            <code>schemaNode</code> belongs.\r
      * @param schemaNode\r
      *            schema node for which is created generated type builder\r
+     * @param parent parent type (can be null)\r
      * @return generated type builder <code>schemaNode</code>\r
-     */\r
-    private def GeneratedTypeBuilder addDefaultInterfaceDefinition( String packageName, SchemaNode schemaNode) {\r
-        val builder = addRawInterfaceDefinition(packageName, schemaNode, "");\r
-        builder.addImplementsType(DATA_OBJECT);\r
-        if (!(schemaNode instanceof GroupingDefinition)) {\r
-            builder.addImplementsType(augmentable(builder));\r
-        }\r
-\r
-        if (schemaNode instanceof DataNodeContainer) {\r
-            addImplementedInterfaceFromUses( schemaNode as DataNodeContainer, builder);\r
-        }\r
-\r
-        return builder;\r
-    }\r
-\r
+     */
+    private def GeneratedTypeBuilder addDefaultInterfaceDefinition(String packageName, SchemaNode schemaNode,
+        Type parent) {
+        val builder = addRawInterfaceDefinition(packageName, schemaNode, "");
+        if (parent === null) {
+            builder.addImplementsType(DATA_OBJECT);
+        } else {
+            builder.addImplementsType(BindingTypes.childOf(parent));
+        }
+        if (!(schemaNode instanceof GroupingDefinition)) {
+            builder.addImplementsType(augmentable(builder));
+        }
+
+        if (schemaNode instanceof DataNodeContainer) {
+            addImplementedInterfaceFromUses(schemaNode as DataNodeContainer, builder);
+        }
+
+        return builder;
+    }
+
     /**\r
      * Wraps the calling of the same overloaded method.\r
      *\r
@@ -1623,11 +1531,11 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * @param schemaNode\r
      *            schema node which provide data about the schema node name\r
      * @return generated type builder for <code>schemaNode</code>\r
-     */\r
-    private def GeneratedTypeBuilder addRawInterfaceDefinition( String packageName,  SchemaNode schemaNode) {\r
-        return addRawInterfaceDefinition(packageName, schemaNode, "");\r
-    }\r
-\r
+     */
+    private def GeneratedTypeBuilder addRawInterfaceDefinition(String packageName, SchemaNode schemaNode) {
+        return addRawInterfaceDefinition(packageName, schemaNode, "");
+    }
+
     /**\r
      * Returns reference to generated type builder for specified\r
      * <code>schemaNode</code> with <code>packageName</code>.\r
@@ -1641,6 +1549,7 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *            builder belongs\r
      * @param schemaNode\r
      *            schema node which provide data about the schema node name\r
+     * @param prefix return type name prefix\r
      * @return generated type builder for <code>schemaNode</code>\r
      * @throws IllegalArgumentException\r
      *             <ul>\r
@@ -1650,56 +1559,57 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *             <li>if schema node name is nul</li>\r
      *             </ul>\r
      *\r
-     */\r
-    private def GeneratedTypeBuilder addRawInterfaceDefinition( String packageName,  SchemaNode schemaNode,\r
-             String prefix) {\r
-        checkArgument(schemaNode !== null,"Data Schema Node cannot be NULL.");\r
-        checkArgument(packageName !== null,"Package Name for Generated Type cannot be NULL.");\r
-        checkArgument(schemaNode.QName !== null,"QName for Data Schema Node cannot be NULL.");\r
-        val schemaNodeName = schemaNode.QName.localName;\r
-        checkArgument(schemaNodeName !== null,"Local Name of QName for Data Schema Node cannot be NULL.");\r
-\r
-        var String genTypeName;\r
-        if (prefix === null) {\r
-            genTypeName = parseToClassName(schemaNodeName);\r
-        } else {\r
-            genTypeName = prefix + parseToClassName(schemaNodeName);\r
-        }\r
+     */
+    private def GeneratedTypeBuilder addRawInterfaceDefinition(String packageName, SchemaNode schemaNode,
+        String prefix) {
+        checkArgument(schemaNode !== null, "Data Schema Node cannot be NULL.");
+        checkArgument(packageName !== null, "Package Name for Generated Type cannot be NULL.");
+        checkArgument(schemaNode.QName !== null, "QName for Data Schema Node cannot be NULL.");
+        val schemaNodeName = schemaNode.QName.localName;
+        checkArgument(schemaNodeName !== null, "Local Name of QName for Data Schema Node cannot be NULL.");
+
+        var String genTypeName;
+        if (prefix === null) {
+            genTypeName = parseToClassName(schemaNodeName);
+        } else {
+            genTypeName = prefix + parseToClassName(schemaNodeName);
+        }
+
         //FIXME: Validation of name conflict\r
-        val newType = new GeneratedTypeBuilderImpl(packageName, genTypeName);\r
-        yangToJavaMapping.put(schemaNode.path,newType);\r
-        if (!genTypeBuilders.containsKey(packageName)) {\r
-            val Map<String, GeneratedTypeBuilder> builders = new HashMap();\r
-            builders.put(genTypeName, newType);\r
-            genTypeBuilders.put(packageName, builders);\r
-        } else {\r
-            val Map<String, GeneratedTypeBuilder> builders = genTypeBuilders.get(packageName);\r
-            if (!builders.containsKey(genTypeName)) {\r
-                builders.put(genTypeName, newType);\r
-            }\r
-        }\r
-        return newType;\r
-    }\r
-\r
+        val newType = new GeneratedTypeBuilderImpl(packageName, genTypeName);
+        if (!genTypeBuilders.containsKey(packageName)) {
+            val Map<String, GeneratedTypeBuilder> builders = new HashMap();
+            builders.put(genTypeName, newType);
+            genTypeBuilders.put(packageName, builders);
+        } else {
+            val Map<String, GeneratedTypeBuilder> builders = genTypeBuilders.get(packageName);
+            if (!builders.containsKey(genTypeName)) {
+                builders.put(genTypeName, newType);
+            }
+        }
+        return newType;
+    }
+
     /**\r
      * Creates the name of the getter method from <code>methodName</code>.\r
      *\r
      * @param methodName\r
      *            string with the name of the getter method\r
+     * @param returnType return type\r
      * @return string with the name of the getter method for\r
      *         <code>methodName</code> in JAVA method format\r
-     */\r
-    private def String getterMethodName( String methodName,Type returnType) {\r
-        val method = new StringBuilder();\r
-        if(BOOLEAN.equals(returnType)) {\r
-            method.append("is");\r
-        } else {\r
-            method.append("get");\r
-        }\r
-        method.append(parseToClassName(methodName));\r
-        return method.toString();\r
-    }\r
-\r
+     */
+    private def String getterMethodName(String methodName, Type returnType) {
+        val method = new StringBuilder();
+        if (BOOLEAN.equals(returnType)) {
+            method.append("is");
+        } else {
+            method.append("get");
+        }
+        method.append(parseToClassName(methodName));
+        return method.toString();
+    }
+
     /**\r
      * Created a method signature builder as part of\r
      * <code>interfaceBuilder</code>.\r
@@ -1720,46 +1630,15 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *            type which represents the return type of the getter method\r
      * @return method signature builder which represents the getter method of\r
      *         <code>interfaceBuilder</code>\r
-     */\r
-    private def MethodSignatureBuilder constructGetter( GeneratedTypeBuilder interfaceBuilder,\r
-             String schemaNodeName,  String comment,  Type returnType) {\r
-\r
-        val getMethod = interfaceBuilder.addMethod(getterMethodName(schemaNodeName,returnType));\r
-\r
-        getMethod.setComment(comment);\r
-        getMethod.setReturnType(returnType);\r
-\r
-        return getMethod;\r
-    }\r
-\r
-    private def listToGenType( String basePackageName,  ListSchemaNode list) {\r
-        checkArgument(basePackageName !== null,"Package Name for Generated Type cannot be NULL.");\r
-        checkArgument(list !== null,"List Schema Node cannot be NULL.");\r
-\r
-        val packageName = packageNameForGeneratedType(basePackageName, list.path);\r
-        // val typeBuilder =\r
-        // resolveListTypeBuilder(packageName, list);\r
-        val typeBuilder = addDefaultInterfaceDefinition(packageName, list);\r
-\r
-        val List<String> listKeys = listKeys(list);\r
-        val genTOBuilder = resolveListKeyTOBuilder(packageName, list);\r
-\r
-        if (genTOBuilder !== null) {\r
-            val identifierMarker = IDENTIFIER.parameterizedTypeFor(typeBuilder);\r
-            val identifiableMarker = IDENTIFIABLE.parameterizedTypeFor(genTOBuilder);\r
-            genTOBuilder.addImplementsType(identifierMarker);\r
-            typeBuilder.addImplementsType(identifiableMarker);\r
-        }\r
-        val schemaNodes = list.childNodes;\r
-\r
-        for (schemaNode : schemaNodes) {\r
-            if (!schemaNode.isAugmenting()) {\r
-                addSchemaNodeToListBuilders(basePackageName, schemaNode, typeBuilder, genTOBuilder, listKeys);\r
-            }\r
-        }\r
-        return typeBuildersToGenTypes(typeBuilder, genTOBuilder);\r
-    }\r
-\r
+     */
+    private def MethodSignatureBuilder constructGetter(GeneratedTypeBuilder interfaceBuilder, String schemaNodeName,
+        String comment, Type returnType) {
+        val getMethod = interfaceBuilder.addMethod(getterMethodName(schemaNodeName, returnType));
+        getMethod.setComment(comment);
+        getMethod.setReturnType(returnType);
+        return getMethod;
+    }
+
     /**\r
      * Adds <code>schemaNode</code> to <code>typeBuilder</code> as getter method\r
      * or to <code>genTOBuilder</code> as property.\r
@@ -1776,48 +1655,49 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *            generated TO builder for the list keys\r
      * @param listKeys\r
      *            list of string which contains names of the list keys\r
+     * @param module current module\r
      * @throws IllegalArgumentException\r
      *             <ul>\r
      *             <li>if <code>schemaNode</code> equals null</li>\r
      *             <li>if <code>typeBuilder</code> equals null</li>\r
      *             </ul>\r
-     */\r
-    private def void addSchemaNodeToListBuilders( String basePackageName,  DataSchemaNode schemaNode,\r
-             GeneratedTypeBuilder typeBuilder,  GeneratedTOBuilder genTOBuilder,  List<String> listKeys) {\r
-        checkArgument(schemaNode !== null,"Data Schema Node cannot be NULL.");\r
-\r
-        checkArgument(typeBuilder !== null,"Generated Type Builder cannot be NULL.");\r
-\r
-        if (schemaNode instanceof LeafSchemaNode) {\r
-            val leaf = schemaNode as LeafSchemaNode;\r
-            val leafName = leaf.QName.localName;\r
-            if (!listKeys.contains(leafName)) {\r
-                resolveLeafSchemaNodeAsMethod(typeBuilder, leaf);\r
-            } else {\r
-                resolveLeafSchemaNodeAsProperty(genTOBuilder, leaf, true);\r
-            }\r
-        } else if (schemaNode instanceof LeafListSchemaNode) {\r
-            resolveLeafListSchemaNode(typeBuilder,  schemaNode as LeafListSchemaNode);\r
-        } else if (schemaNode instanceof ContainerSchemaNode) {\r
-            resolveContainerSchemaNode(basePackageName, typeBuilder, schemaNode as ContainerSchemaNode);\r
-        } else if (schemaNode instanceof ListSchemaNode) {\r
-            resolveListSchemaNode(basePackageName, typeBuilder, schemaNode as ListSchemaNode);\r
-        }\r
-    }\r
-\r
-    private def typeBuildersToGenTypes( GeneratedTypeBuilder typeBuilder, GeneratedTOBuilder genTOBuilder) {\r
-        val List<Type> genTypes = new ArrayList();\r
-        checkArgument(typeBuilder !== null,"Generated Type Builder cannot be NULL.");\r
-\r
-        if (genTOBuilder !== null) {\r
-            val genTO = genTOBuilder.toInstance();\r
-            constructGetter(typeBuilder, "key", "Returns Primary Key of Yang List Type", genTO);\r
-            genTypes.add(genTO);\r
-        }\r
-        genTypes.add(typeBuilder.toInstance());\r
-        return genTypes;\r
-    }\r
-\r
+     */
+    private def void addSchemaNodeToListBuilders(String basePackageName, DataSchemaNode schemaNode,
+        GeneratedTypeBuilder typeBuilder, GeneratedTOBuilder genTOBuilder, List<String> listKeys, Module module) {
+        checkArgument(schemaNode !== null, "Data Schema Node cannot be NULL.");
+        checkArgument(typeBuilder !== null, "Generated Type Builder cannot be NULL.");
+
+        if (schemaNode instanceof LeafSchemaNode) {
+            val leaf = schemaNode as LeafSchemaNode;
+            val leafName = leaf.QName.localName;
+            if (!listKeys.contains(leafName)) {
+                resolveLeafSchemaNodeAsMethod(typeBuilder, leaf);
+            } else {
+                resolveLeafSchemaNodeAsProperty(genTOBuilder, leaf, true);
+            }
+        } else if (!schemaNode.addedByUses) {
+            if (schemaNode instanceof LeafListSchemaNode) {
+                resolveLeafListSchemaNode(typeBuilder, schemaNode as LeafListSchemaNode);
+            } else if (schemaNode instanceof ContainerSchemaNode) {
+                containerToGenType(module, basePackageName, typeBuilder, typeBuilder, schemaNode as ContainerSchemaNode);
+            } else if (schemaNode instanceof ChoiceNode) {
+                choiceToGeneratedType(module, basePackageName, typeBuilder, schemaNode as ChoiceNode);
+            } else if (schemaNode instanceof ListSchemaNode) {
+                listToGenType(module, basePackageName, typeBuilder, typeBuilder, schemaNode as ListSchemaNode);
+            }
+        }
+    }
+
+    private def typeBuildersToGenTypes(Module module, GeneratedTypeBuilder typeBuilder, GeneratedTOBuilder genTOBuilder) {
+        checkArgument(typeBuilder !== null, "Generated Type Builder cannot be NULL.");
+
+        if (genTOBuilder !== null) {
+            val genTO = genTOBuilder.toInstance();
+            constructGetter(typeBuilder, "key", "Returns Primary Key of Yang List Type", genTO);
+            genCtx.get(module).addGeneratedTOBuilder(genTOBuilder)
+        }
+    }
+
     /**\r
      * Selects the names of the list keys from <code>list</code> and returns\r
      * them as the list of the strings\r
@@ -1827,19 +1707,19 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * @return list of string which represents names of the list keys. If the\r
      *         <code>list</code> contains no keys then the empty list is\r
      *         returned.\r
-     */\r
-    private def listKeys( ListSchemaNode list) {\r
-        val List<String> listKeys = new ArrayList();\r
-\r
-        if (list.keyDefinition !== null) {\r
-            val keyDefinitions = list.keyDefinition;\r
-            for (keyDefinition : keyDefinitions) {\r
-                listKeys.add(keyDefinition.localName);\r
-            }\r
-        }\r
-        return listKeys;\r
-    }\r
-\r
+     */
+    private def listKeys(ListSchemaNode list) {
+        val List<String> listKeys = new ArrayList();
+
+        if (list.keyDefinition !== null) {
+            val keyDefinitions = list.keyDefinition;
+            for (keyDefinition : keyDefinitions) {
+                listKeys.add(keyDefinition.localName);
+            }
+        }
+        return listKeys;
+    }
+
     /**\r
      * Generates for the <code>list</code> which contains any list keys special\r
      * generated TO builder.\r
@@ -1851,19 +1731,19 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * @return generated TO builder which represents the keys of the\r
      *         <code>list</code> or null if <code>list</code> is null or list of\r
      *         key definitions is null or empty.\r
-     */\r
-    private def GeneratedTOBuilder resolveListKeyTOBuilder( String packageName,  ListSchemaNode list) {\r
-        var GeneratedTOBuilder genTOBuilder = null;\r
-        if ((list.keyDefinition !== null) && (!list.keyDefinition.isEmpty())) {\r
-            if (list !== null) {\r
-                val listName = list.QName.localName + "Key";\r
-                genTOBuilder = schemaNodeToTransferObjectBuilder(packageName, listName);\r
-            }\r
-        }\r
-        return genTOBuilder;\r
-\r
-    }\r
-\r
+     */
+    private def GeneratedTOBuilder resolveListKeyTOBuilder(String packageName, ListSchemaNode list) {
+        var GeneratedTOBuilder genTOBuilder = null;
+        if ((list.keyDefinition !== null) && (!list.keyDefinition.isEmpty())) {
+            if (list !== null) {
+                val listName = list.QName.localName + "Key";
+                val String genTOName = parseToClassName(listName);
+                genTOBuilder = new GeneratedTOBuilderImpl(packageName, genTOName);
+            }
+        }
+        return genTOBuilder;
+    }
+
     /**\r
      * Builds generated TO builders for <code>typeDef</code> of type\r
      * {@link org.opendaylight.yangtools.yang.model.util.UnionType UnionType} or\r
@@ -1883,30 +1763,35 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *            from <code>typeDef</code>\r
      * @param leafName\r
      *            string with name for generated TO builder\r
+     * @param leaf\r
+     * @param parentModule\r
      * @return generated TO builder for <code>typeDef</code>\r
-     */\r
-    private def GeneratedTOBuilder addTOToTypeBuilder(TypeDefinition<?> typeDef, GeneratedTypeBuilder typeBuilder,\r
-            String leafName, LeafSchemaNode leaf, Module parentModule) {\r
-        val classNameFromLeaf = parseToClassName(leafName);\r
-        val List<GeneratedTOBuilder> genTOBuilders = new ArrayList();\r
-        val packageName = typeBuilder.fullyQualifiedName;\r
-        if (typeDef instanceof UnionTypeDefinition) {\r
-            genTOBuilders.addAll((typeProvider as TypeProviderImpl).provideGeneratedTOBuildersForUnionTypeDef(\r
-                    packageName, typeDef, classNameFromLeaf, leaf));\r
-        } else if (typeDef instanceof BitsTypeDefinition) {\r
-            genTOBuilders.add(((typeProvider as TypeProviderImpl) ).provideGeneratedTOBuilderForBitsTypeDefinition(\r
-                    packageName, typeDef, classNameFromLeaf));\r
-        }\r
-        if (genTOBuilders !== null && !genTOBuilders.isEmpty()) {\r
-            for (genTOBuilder : genTOBuilders) {\r
-                typeBuilder.addEnclosingTransferObject(genTOBuilder);\r
-            }\r
-            return genTOBuilders.get(0);\r
-        }\r
-        return null;\r
-\r
-    }\r
-\r
+     */
+    private def GeneratedTOBuilder addTOToTypeBuilder(TypeDefinition<?> typeDef, GeneratedTypeBuilder typeBuilder,
+        String leafName, LeafSchemaNode leaf, Module parentModule) {
+        val classNameFromLeaf = parseToClassName(leafName);
+        val List<GeneratedTOBuilder> genTOBuilders = new ArrayList();
+        val packageName = typeBuilder.fullyQualifiedName;
+        if (typeDef instanceof UnionTypeDefinition) {
+            genTOBuilders.addAll(
+                (typeProvider as TypeProviderImpl).
+                    provideGeneratedTOBuildersForUnionTypeDef(packageName, (typeDef as UnionTypeDefinition),
+                        classNameFromLeaf, leaf));
+        } else if (typeDef instanceof BitsTypeDefinition) {
+            genTOBuilders.add(
+                ((typeProvider as TypeProviderImpl) ).
+                    provideGeneratedTOBuilderForBitsTypeDefinition(packageName, typeDef, classNameFromLeaf));
+        }
+        if (genTOBuilders !== null && !genTOBuilders.isEmpty()) {
+            for (genTOBuilder : genTOBuilders) {
+                typeBuilder.addEnclosingTransferObject(genTOBuilder);
+            }
+            return genTOBuilders.get(0);
+        }
+        return null;
+
+    }
+
     /**\r
      * Adds the implemented types to type builder.\r
      *\r
@@ -1922,19 +1807,49 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *            builder to which are added implemented types according to\r
      *            <code>dataNodeContainer</code>\r
      * @return generated type builder with all implemented types\r
-     */\r
-    private def addImplementedInterfaceFromUses( DataNodeContainer dataNodeContainer,\r
-            GeneratedTypeBuilder builder) {\r
-        for (usesNode : dataNodeContainer.uses) {\r
-            if (usesNode.groupingPath !== null) {\r
-                val genType = allGroupings.get(usesNode.groupingPath);\r
-                if (genType === null) {\r
-                    throw new IllegalStateException("Grouping " + usesNode.groupingPath + "is not resolved for "\r
-                            + builder.name);\r
-                }\r
-                builder.addImplementsType(genType);\r
-            }\r
-        }\r
-        return builder;\r
-    }\r
+     */
+    private def addImplementedInterfaceFromUses(DataNodeContainer dataNodeContainer, GeneratedTypeBuilder builder) {
+        for (usesNode : dataNodeContainer.uses) {
+            if (usesNode.groupingPath !== null) {
+                val genType = findGroupingByPath(usesNode.groupingPath).toInstance
+                if (genType === null) {
+                    throw new IllegalStateException(
+                        "Grouping " + usesNode.groupingPath + "is not resolved for " + builder.name);
+                }
+                builder.addImplementsType(genType);
+            }
+        }
+        return builder;
+    }
+
+    private def GeneratedTypeBuilder findChildNodeByPath(SchemaPath path) {
+        for (ctx : genCtx.values) {
+            var result = ctx.getChildNode(path)
+            if (result !== null) {
+                return result
+            }
+        }
+        return null
+    }
+
+    private def GeneratedTypeBuilder findGroupingByPath(SchemaPath path) {
+        for (ctx : genCtx.values) {
+            var result = ctx.getGrouping(path)
+            if (result !== null) {
+                return result
+            }
+        }
+        return null
+    }
+
+    private def GeneratedTypeBuilder findCaseByPath(SchemaPath path) {
+        for (ctx : genCtx.values) {
+            var result = ctx.getCase(path)
+            if (result !== null) {
+                return result
+            }
+        }
+        return null
+    }
+
 }