Add ability to get yang sources from SchemaContext.
[yangtools.git] / code-generator / binding-generator-impl / src / main / java / org / opendaylight / yangtools / sal / binding / generator / impl / BindingGeneratorImpl.xtend
index 751930767de48ff0fce1ad2798fffe1ca329d95f..94d4812cd039f3c5e72b6f46d85f503d51f761fb 100644 (file)
@@ -7,12 +7,20 @@
  */
 package org.opendaylight.yangtools.sal.binding.generator.impl;
 
+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 java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.Iterator
+import java.util.Collection
 import org.opendaylight.yangtools.binding.generator.util.BindingTypes;
 import org.opendaylight.yangtools.binding.generator.util.ReferencedTypeImpl;
 import org.opendaylight.yangtools.binding.generator.util.Types;
@@ -21,7 +29,6 @@ import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.
 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.GeneratedType;
 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;
@@ -55,17 +62,33 @@ 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 org.opendaylight.yangtools.yang.model.api.AugmentationTarget
+import org.opendaylight.yangtools.yang.model.api.NotificationDefinition
+import org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil
+import org.opendaylight.yangtools.sal.binding.model.api.Restrictions
+import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedPropertyBuilder
+import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.GeneratedPropertyBuilderImpl
+import org.opendaylight.yangtools.yang.common.QName
+import org.opendaylight.yangtools.yang.binding.BindingMapping
+import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTypeBuilderBase
+
+import com.google.common.collect.Sets
+import java.net.URI
+import java.util.Date
 
 public class BindingGeneratorImpl implements BindingGenerator {
+
+    private final Map<Module, ModuleContext> genCtx = new HashMap()
+
     /**
-     * Outter key represents the package name. Outter value represents map of
+     * Outer key represents the package name. Outer value represents map of
      * all builders in the same package. Inner key represents the schema node
      * name (in JAVA class/interface name format). Inner value represents
      * instance of builder for schema node specified in key part.
@@ -78,23 +101,11 @@ public class BindingGeneratorImpl implements BindingGenerator {
     private var TypeProvider typeProvider;
 
     /**
-     * Holds reference to schema context to resolve data of augmented elemnt
+     * Holds reference to schema context to resolve data of augmented element
      * when creating augmentation builder
      */
     private var SchemaContext schemaContext;
 
-    /**
-     * Each grouping which is converted from schema node to generated type is
-     * added to this map with its Schema path as key to make it easier to get
-     * reference to it. In schema nodes in <code>uses</code> attribute there is
-     * only Schema Path but when building list of implemented interfaces for
-     * Schema node the object of type <code>Type</code> is required. So in this
-     * case is used this map.
-     */
-    private val allGroupings = new HashMap<SchemaPath, GeneratedType>();
-
-    private val yangToJavaMapping = new HashMap<SchemaPath, Type>();
-
     /**
      * Constant with the concrete name of namespace.
      */
@@ -165,49 +176,53 @@ public class BindingGeneratorImpl implements BindingGenerator {
         checkState(context.modules !== null, "Schema Context does not contain defined modules.");
         checkArgument(modules !== null, "Set of Modules cannot be NULL.");
 
-        val List<Type> filteredGenTypes = new ArrayList();
-
         schemaContext = context;
         typeProvider = new TypeProviderImpl(context);
         val contextModules = ModuleDependencySort.sort(context.modules);
         genTypeBuilders = new HashMap();
 
         for (contextModule : contextModules) {
-            val List<Type> generatedTypes = new ArrayList();
-            generatedTypes.addAll(allTypeDefinitionsToGenTypes(contextModule));
-            generatedTypes.addAll(allGroupingsToGenTypes(contextModule));
-            if(false == contextModule.childNodes.isEmpty()) {
-                generatedTypes.add(moduleToDataType(contextModule));
-            }
-            generatedTypes.addAll(allContainersToGenTypes(contextModule));
-            generatedTypes.addAll(allListsToGenTypes(contextModule));
-            generatedTypes.addAll(allChoicesToGenTypes(contextModule));
-            generatedTypes.addAll(allRPCMethodsToGenType(contextModule));
-            generatedTypes.addAll(allNotificationsToGenType(contextModule));
-            generatedTypes.addAll(allIdentitiesToGenTypes(contextModule, context));
-
-            if(modules.contains(contextModule)) {
-                filteredGenTypes.addAll(generatedTypes);
-            }
+            moduleToGenTypes(contextModule, context);
         }
         for (contextModule : contextModules) {
-            val generatedTypes = (allAugmentsToGenTypes(contextModule));
-            if(modules.contains(contextModule)) {
-                filteredGenTypes.addAll(generatedTypes);
-            }
+            allAugmentsToGenTypes(contextModule);
+        }
 
+        val List<Type> filteredGenTypes = new ArrayList();
+        for (Module m : modules) {
+            val ctx = checkNotNull(genCtx.get(m), "Module context not found for module %s", m)
+            filteredGenTypes.addAll(ctx.generatedTypes);
+            val Set<Type> additionalTypes = (typeProvider as TypeProviderImpl).additionalTypes.get(m)
+            if (additionalTypes != null) {
+                filteredGenTypes.addAll(additionalTypes)
+            }
         }
+
         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)
+        }
+    }
+
     /**
      * Converts all extended type definitions of module to the list of
      * <code>Type</code> objects.
      *
      * @param module
      *            module from which is obtained set of type definitions
-     * @return list of <code>Type</code> which are generated from extended
-     *         definition types (object of type <code>ExtendedType</code>)
      * @throws IllegalArgumentException
      *             <ul>
      *             <li>if module equals null</li>
@@ -216,134 +231,88 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *             </ul>
      *
      */
-    private def List<Type> allTypeDefinitionsToGenTypes(Module module) {
+    private def void allTypeDefinitionsToGenTypes(Module module) {
         checkArgument(module !== null, "Module reference cannot be NULL.");
         checkArgument(module.name !== null, "Module name cannot be NULL.");
-        val Set<TypeDefinition<?>> typeDefinitions = module.typeDefinitions;
+        val it = new DataNodeIterator(module);
+        val List<TypeDefinition<?>> typeDefinitions = it.allTypedefs;
         checkState(typeDefinitions !== null, '''Type Definitions for module «module.name» cannot be NULL.''');
 
-        val List<Type> generatedTypes = new ArrayList();
         for (TypeDefinition<?> typedef : typeDefinitions) {
-            if(typedef !== null) {
+            if (typedef !== null) {
                 val type = (typeProvider as TypeProviderImpl).generatedTypeForExtendedDefinitionType(typedef, typedef);
-                if((type !== null) && !generatedTypes.contains(type)) {
-                    generatedTypes.add(type);
+                if (type !== null) {
+                    genCtx.get(module).addTypedefType(typedef.path, type)
                 }
             }
         }
-        return generatedTypes;
     }
 
-    /**
-     * Converts all <b>containers</b> of the module to the list of
-     * <code>Type</code> objects.
-     *
-     * @param module
-     *            module from which is obtained DataNodeIterator to iterate over
-     *            all containers
-     * @return list of <code>Type</code> which are generated from containers
-     *         (objects of type <code>ContainerSchemaNode</code>)
-     * @throws IllegalArgumentException
-     *             <ul>
-     *             <li>if the module equals null</li>
-     *             <li>if the name of module equals null</li>
-     *             <li>if the set of child nodes equals null</li>
-     *             </ul>
-     *
-     */
-    private def List<Type> allContainersToGenTypes(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 Child Nodes in module " + module.name + " cannot be NULL.");
+    private def GeneratedTypeBuilder processDataSchemaNode(Module module, String basePackageName,
+        GeneratedTypeBuilder parent, GeneratedTypeBuilder childOf, DataSchemaNode node) {
+        if (node.augmenting || node.addedByUses) {
+            return null
         }
-
-        val List<Type> generatedTypes = new ArrayList();
-        val it = new DataNodeIterator(module);
-        val List<ContainerSchemaNode> schemaContainers = it.allContainers();
-        val basePackageName = moduleNamespaceToPackageName(module);
-        for (container : schemaContainers) {
-            if(!container.isAddedByUses()) {
-                generatedTypes.add(containerToGenType(basePackageName, container));
-            }
+        val packageName = packageNameForGeneratedType(basePackageName, node.path)
+        val genType = addDefaultInterfaceDefinition(packageName, node, childOf)
+        if (node instanceof DataNodeContainer) {
+            genCtx.get(module).addChildNodeType(node.path, genType)
+            groupingsToGenTypes(module, (node as DataNodeContainer).groupings)
+            processUsesAugments(node as DataNodeContainer, module)
         }
-        return generatedTypes;
+        return genType
     }
 
-    /**
-     * Converts all <b>lists</b> of the module to the list of <code>Type</code>
-     * objects.
-     *
-     * @param module
-     *            module from which is obtained DataNodeIterator to iterate over
-     *            all lists
-     * @return list of <code>Type</code> which are generated from lists (objects
-     *         of type <code>ListSchemaNode</code>)
-     * @throws IllegalArgumentException
-     *             <ul>
-     *             <li>if the module equals null</li>
-     *             <li>if the name of module equals null</li>
-     *             <li>if the set of child nodes equals null</li>
-     *             </ul>
-     *
-     */
-    private def List<Type> allListsToGenTypes(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 Child Nodes in module " + module.name + " cannot be NULL.");
+    private def void containerToGenType(Module module, String basePackageName, GeneratedTypeBuilder parent,
+        GeneratedTypeBuilder childOf, ContainerSchemaNode node) {
+        val genType = processDataSchemaNode(module, basePackageName, parent, childOf, node)
+        if (genType != null) {
+            constructGetter(parent, node.QName.localName, node.description, genType)
+            resolveDataSchemaNodes(module, basePackageName, genType, genType, node.childNodes)
         }
+    }
 
-        val List<Type> generatedTypes = new ArrayList();
-        val it = new DataNodeIterator(module);
-        val List<ListSchemaNode> schemaLists = it.allLists();
-        val basePackageName = moduleNamespaceToPackageName(module);
-        if(schemaLists !== null) {
-            for (list : schemaLists) {
-                if(!list.isAddedByUses()) {
-                    generatedTypes.addAll(listToGenType(basePackageName, list));
+    private def void listToGenType(Module module, String basePackageName, GeneratedTypeBuilder parent,
+        GeneratedTypeBuilder childOf, ListSchemaNode node) {
+        val genType = processDataSchemaNode(module, basePackageName, parent, childOf, node)
+        if (genType != null) {
+            constructGetter(parent, node.QName.localName, node.description, Types.listTypeFor(genType))
+
+            val List<String> listKeys = listKeys(node);
+            val packageName = packageNameForGeneratedType(basePackageName, (node).path)
+            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);
                 }
             }
+
+            // serialVersionUID
+            if (genTOBuilder !== null) {
+                val GeneratedPropertyBuilder prop = new GeneratedPropertyBuilderImpl("serialVersionUID");
+                prop.setValue(Long.toString(computeDefaultSUID(genTOBuilder as GeneratedTOBuilderImpl)));
+                genTOBuilder.setSUID(prop);
+            }
+
+            typeBuildersToGenTypes(module, genType, genTOBuilder);
         }
-        return generatedTypes;
     }
 
-    /**
-     * Converts all <b>choices</b> of the module to the list of
-     * <code>Type</code> objects.
-     *
-     * @param module
-     *            module from which is obtained DataNodeIterator to iterate over
-     *            all choices
-     * @return list of <code>Type</code> which are generated from choices
-     *         (objects of type <code>ChoiceNode</code>)
-     * @throws IllegalArgumentException
-     *             <ul>
-     *             <li>if the module equals null</li>
-     *             <li>if the name of module equals null</li> *
-     *             </ul>
-     *
-     */
-    private def List<GeneratedType> allChoicesToGenTypes(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 choiceNodes = it.allChoices();
+    private def void processUsesAugments(DataNodeContainer node, Module module) {
         val basePackageName = moduleNamespaceToPackageName(module);
-
-        val List<GeneratedType> generatedTypes = new ArrayList();
-        for (choice : choiceNodes) {
-            if((choice !== null) && !choice.isAddedByUses()) {
-                generatedTypes.addAll(choiceToGeneratedType(basePackageName, choice));
+        for (usesNode : node.uses) {
+            for (augment : usesNode.augmentations) {
+                usesAugmentationToGenTypes(basePackageName, augment, module, usesNode, node);
+                processUsesAugments(augment, module);
             }
         }
-        return generatedTypes;
     }
 
     /**
@@ -353,8 +322,6 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * @param module
      *            module from which is obtained list of all augmentation objects
      *            to iterate over them
-     * @return list of <code>Type</code> which are generated from augments
-     *         (objects of type <code>AugmentationSchema</code>)
      * @throws IllegalArgumentException
      *             <ul>
      *             <li>if the module equals null</li>
@@ -363,21 +330,19 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *             </ul>
      *
      */
-    private def List<Type> allAugmentsToGenTypes(Module module) {
+    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) {
+        if (module.childNodes === null) {
             throw new IllegalArgumentException(
                 "Reference to Set of Augmentation Definitions in module " + module.name + " cannot be NULL.");
         }
 
-        val List<Type> generatedTypes = new ArrayList();
         val basePackageName = moduleNamespaceToPackageName(module);
         val List<AugmentationSchema> augmentations = resolveAugmentations(module);
         for (augment : augmentations) {
-            generatedTypes.addAll(augmentationToGenTypes(basePackageName, augment));
+            augmentationToGenTypes(basePackageName, augment, module);
         }
-        return generatedTypes;
     }
 
     /**
@@ -404,9 +369,9 @@ public class BindingGeneratorImpl implements BindingGenerator {
         val List<AugmentationSchema> sortedAugmentations = new ArrayList(augmentations);
         Collections.sort(sortedAugmentations,
             [ augSchema1, augSchema2 |
-                if(augSchema1.targetPath.path.size() > augSchema2.targetPath.path.size()) {
+                if (augSchema1.targetPath.path.size() > augSchema2.targetPath.path.size()) {
                     return 1;
-                } else if(augSchema1.targetPath.path.size() < augSchema2.targetPath.path.size()) {
+                } else if (augSchema1.targetPath.path.size() < augSchema2.targetPath.path.size()) {
                     return -1;
                 }
                 return 0;
@@ -428,19 +393,13 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *             if the module equals null
      *
      */
-    private def GeneratedType moduleToDataType(Module module) {
+    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);
-
-        val basePackageName = moduleNamespaceToPackageName(module);
-        if(moduleDataTypeBuilder !== null) {
-            val Set<DataSchemaNode> dataNodes = module.childNodes;
-            resolveDataSchemaNodes(basePackageName, moduleDataTypeBuilder, dataNodes);
-        }
-        return moduleDataTypeBuilder.toInstance();
+        return moduleDataTypeBuilder;
     }
 
     /**
@@ -451,8 +410,6 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * @param module
      *            module from which is obtained set of all rpc objects to
      *            iterate over them
-     * @return list of <code>Type</code> which are generated from rpcs inputs,
-     *         outputs + container and lists which are part of inputs or outputs
      * @throws IllegalArgumentException
      *             <ul>
      *             <li>if the module equals null</li>
@@ -461,88 +418,56 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *             </ul>
      *
      */
-    private def List<Type> allRPCMethodsToGenType(Module module) {
+    private def void rpcMethodsToGenType(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 RPC Method Definitions in module " + 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 Collections.emptyList();
+        if (rpcDefinitions.isEmpty()) {
+            return;
         }
 
-        val List<Type> genRPCTypes = new ArrayList();
         val interfaceBuilder = moduleTypeBuilder(module, "Service");
         interfaceBuilder.addImplementsType(Types.typeForClass(RpcService));
         for (rpc : rpcDefinitions) {
-            if(rpc !== null) {
-
-                val rpcName = parseToClassName(rpc.QName.localName);
+            if (rpc !== null) {
+                val rpcName = BindingMapping.getClassName(rpc.QName);
                 val rpcMethodName = parseToValidParamName(rpcName);
                 val method = interfaceBuilder.addMethod(rpcMethodName);
-
-                val rpcInOut = new ArrayList();
-
                 val input = rpc.input;
                 val output = rpc.output;
 
-                if(input !== null) {
-                    rpcInOut.add(new DataNodeIterator(input));
+                if (input !== null) {
                     val inType = addRawInterfaceDefinition(basePackageName, input, rpcName);
                     addImplementedInterfaceFromUses(input, inType);
                     inType.addImplementsType(DATA_OBJECT);
                     inType.addImplementsType(augmentable(inType));
-                    resolveDataSchemaNodes(basePackageName, inType, input.childNodes);
+                    resolveDataSchemaNodes(module, basePackageName, inType, inType, input.childNodes);
+                    genCtx.get(module).addChildNodeType(input.path, inType)
                     val inTypeInstance = inType.toInstance();
-                    genRPCTypes.add(inTypeInstance);
                     method.addParameter(inTypeInstance, "input");
                 }
 
                 var Type outTypeInstance = VOID;
-                if(output !== null) {
-                    rpcInOut.add(new DataNodeIterator(output));
+                if (output !== null) {
                     val outType = addRawInterfaceDefinition(basePackageName, output, rpcName);
                     addImplementedInterfaceFromUses(output, outType);
                     outType.addImplementsType(DATA_OBJECT);
                     outType.addImplementsType(augmentable(outType));
-
-                    resolveDataSchemaNodes(basePackageName, outType, output.childNodes);
+                    resolveDataSchemaNodes(module, basePackageName, outType, outType, output.childNodes);
+                    genCtx.get(module).addChildNodeType(output.path, outType)
                     outTypeInstance = outType.toInstance();
-                    genRPCTypes.add(outTypeInstance);
-
                 }
 
                 val rpcRes = Types.parameterizedTypeFor(Types.typeForClass(RpcResult), outTypeInstance);
                 method.setReturnType(Types.parameterizedTypeFor(FUTURE, rpcRes));
-                for (iter : rpcInOut) {
-                    val List<ContainerSchemaNode> nContainers = iter.allContainers();
-                    if((nContainers !== null) && !nContainers.isEmpty()) {
-                        for (container : nContainers) {
-                            if(!container.isAddedByUses()) {
-                                genRPCTypes.add(containerToGenType(basePackageName, container));
-                            }
-                        }
-                    }
-                    val List<ListSchemaNode> nLists = iter.allLists();
-                    if((nLists !== null) && !nLists.isEmpty()) {
-                        for (list : nLists) {
-                            if(!list.isAddedByUses()) {
-                                genRPCTypes.addAll(listToGenType(basePackageName, list));
-                            }
-                        }
-                    }
-                }
             }
         }
-        genRPCTypes.add(interfaceBuilder.toInstance());
-        return genRPCTypes;
+
+        genCtx.get(module).addTopLevelNodeType(interfaceBuilder)
     }
 
     /**
@@ -553,8 +478,6 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * @param module
      *            module from which is obtained set of all notification objects
      *            to iterate over them
-     * @return list of <code>Type</code> which are generated from notification
-     *         (object of type <code>NotificationDefinition</code>
      * @throws IllegalArgumentException
      *             <ul>
      *             <li>if the module equals null</li>
@@ -563,56 +486,41 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *             </ul>
      *
      */
-    private def List<Type> allNotificationsToGenType(Module module) {
+    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) {
+        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.isEmpty()) return Collections.emptyList();
+        if(notifications.empty) return;
 
         val listenerInterface = moduleTypeBuilder(module, "Listener");
         listenerInterface.addImplementsType(BindingTypes.NOTIFICATION_LISTENER);
-
         val basePackageName = moduleNamespaceToPackageName(module);
-        val List<Type> generatedTypes = new ArrayList();
 
         for (notification : notifications) {
-            if(notification !== null) {
-                val iter = new DataNodeIterator(notification);
+            if (notification !== null) {
+                processUsesAugments(notification, module);
 
-                // Containers
-                for (node : iter.allContainers()) {
-                    if(!node.isAddedByUses()) {
-                        generatedTypes.add(containerToGenType(basePackageName, node));
-                    }
-                }
-
-                // Lists
-                for (node : iter.allLists()) {
-                    if(!node.isAddedByUses()) {
-                        generatedTypes.addAll(listToGenType(basePackageName, node));
-                    }
-                }
-                val notificationInterface = addDefaultInterfaceDefinition(basePackageName, notification);
+                val notificationInterface = addDefaultInterfaceDefinition(basePackageName, notification,
+                    BindingTypes.DATA_OBJECT);
                 notificationInterface.addImplementsType(NOTIFICATION);
+                genCtx.get(module).addChildNodeType(notification.path, notificationInterface)
 
                 // Notification object
-                resolveDataSchemaNodes(basePackageName, notificationInterface, notification.childNodes);
+                resolveDataSchemaNodes(module, basePackageName, notificationInterface, notificationInterface,
+                    notification.childNodes);
 
                 listenerInterface.addMethod("on" + notificationInterface.name) //
                 .setAccessModifier(AccessModifier.PUBLIC).addParameter(notificationInterface, "notification").
                     setReturnType(Types.VOID);
-
-                generatedTypes.add(notificationInterface.toInstance());
             }
         }
-        generatedTypes.add(listenerInterface.toInstance());
-        return generatedTypes;
+
+        genCtx.get(module).addTopLevelNodeType(listenerInterface)
     }
 
     /**
@@ -625,23 +533,17 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * @param context
      *            schema context only used as input parameter for method
      *            {@link identityToGenType}
-     * @return list of <code>Type</code> which are generated from identities
-     *         (object of type <code>IdentitySchemaNode</code>
      *
      */
-    private def List<Type> allIdentitiesToGenTypes(Module module, SchemaContext context) {
-        val List<Type> genTypes = new ArrayList();
-
+    private def void allIdentitiesToGenTypes(Module module, SchemaContext context) {
         val Set<IdentitySchemaNode> schemaIdentities = module.identities;
-
         val basePackageName = moduleNamespaceToPackageName(module);
 
-        if(schemaIdentities !== null && !schemaIdentities.isEmpty()) {
+        if (schemaIdentities !== null && !schemaIdentities.isEmpty()) {
             for (identity : schemaIdentities) {
-                genTypes.add(identityToGenType(basePackageName, identity, context));
+                identityToGenType(module, basePackageName, identity, context);
             }
         }
-        return genTypes;
     }
 
     /**
@@ -652,6 +554,7 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * class {@link org.opendaylight.yangtools.yang.model.api.BaseIdentity
      * BaseIdentity} is added
      *
+     * @param module current module
      * @param basePackageName
      *            string contains the module package name
      * @param identity
@@ -660,65 +563,58 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *            SchemaContext which is used to get package and name
      *            information about base of identity
      *
-     * @return GeneratedType which is generated from identity (object of type
-     *         <code>IdentitySchemaNode</code>
-     *
      */
-    private def GeneratedType identityToGenType(String basePackageName, IdentitySchemaNode identity,
+    private def void identityToGenType(Module module, String basePackageName, IdentitySchemaNode identity,
         SchemaContext context) {
-        if(identity === null) {
-            return null;
+        if (identity === null) {
+            return;
         }
-
         val packageName = packageNameForGeneratedType(basePackageName, identity.path);
-        val genTypeName = parseToClassName(identity.QName.localName);
+        val genTypeName = BindingMapping.getClassName(identity.QName);
         val newType = new GeneratedTOBuilderImpl(packageName, genTypeName);
-
         val baseIdentity = identity.baseIdentity;
-        if(baseIdentity !== null) {
+        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 returnTypeName = BindingMapping.getClassName(baseIdentity.QName);
             val gto = new GeneratedTOBuilderImpl(returnTypePkgName, returnTypeName).toInstance();
             newType.setExtendsType(gto);
-        } else {
-            newType.setExtendsType(Types.baseIdentityTO);
         }
         newType.setAbstract(true);
-        return newType.toInstance();
+        val qname = identity.QName;
+        
+        newType.qnameConstant(BindingMapping.QNAME_STATIC_FIELD_NAME,qname);
+        
+        genCtx.get(module).addIdentityType(identity.QName,newType)
+    }
+    
+    private static def qnameConstant(GeneratedTypeBuilderBase<?> toBuilder, String constantName, QName name) {
+        toBuilder.addConstant(QName.typeForClass,constantName,'''
+            org.opendaylight.yangtools.yang.common.QName.create("«name.namespace»","«name.formattedRevision»","«name.localName»")
+        ''');
     }
 
     /**
      * Converts all <b>groupings</b> of the module to the list of
      * <code>Type</code> objects. Firstly are groupings sorted according mutual
-     * dependencies. At least dependend (indepedent) groupings are in the list
+     * dependencies. At least dependent (independent) groupings are in the list
      * saved at first positions. For every grouping the record is added to map
      * {@link BindingGeneratorImpl#allGroupings allGroupings}
      *
      * @param module
-     *            module from which is obtained set of all grouping objects to
-     *            iterate over them
-     * @return list of <code>Type</code> which are generated from groupings
-     *         (object of type <code>GroupingDefinition</code>)
+     *            current module
+     * @param collection of groupings from which types will be generated
      *
      */
-    private def List<Type> allGroupingsToGenTypes(Module module) {
-        checkArgument(module !== null, "Module parameter can not be null");
-        val List<Type> genTypes = new ArrayList();
+    private def void groupingsToGenTypes(Module module, Collection<GroupingDefinition> groupings) {
         val basePackageName = moduleNamespaceToPackageName(module);
-        val Set<GroupingDefinition> groupings = module.groupings;
         val List<GroupingDefinition> groupingsSortedByDependencies = new GroupingDefinitionDependencySort().sort(
             groupings);
-
         for (grouping : groupingsSortedByDependencies) {
-            val genType = groupingToGenType(basePackageName, grouping);
-            genTypes.add(genType);
-            val schemaPath = grouping.path;
-            allGroupings.put(schemaPath, genType);
+            groupingToGenType(basePackageName, grouping, module);
         }
-        return genTypes;
     }
 
     /**
@@ -730,26 +626,23 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *            string contains the module package name
      * @param grouping
      *            GroupingDefinition which contains data about grouping
+     * @param module current module
      * @return GeneratedType which is generated from grouping (object of type
      *         <code>GroupingDefinition</code>)
      */
-    private def GeneratedType groupingToGenType(String basePackageName, GroupingDefinition grouping) {
-        if(grouping === null) {
-            return null;
-        }
-
+    private def void groupingToGenType(String basePackageName, GroupingDefinition grouping, Module module) {
         val packageName = packageNameForGeneratedType(basePackageName, grouping.path);
-        val Set<DataSchemaNode> schemaNodes = grouping.childNodes;
-        val typeBuilder = addDefaultInterfaceDefinition(packageName, grouping);
-
-        resolveDataSchemaNodes(basePackageName, typeBuilder, schemaNodes);
-        return typeBuilder.toInstance();
+        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);
     }
 
     /**
      * Tries to find EnumTypeDefinition in <code>typeDefinition</code>. If base
      * type of <code>typeDefinition</code> is of the type ExtendedType then this
-     * method is recursivelly called with this base type.
+     * method is recursively called with this base type.
      *
      * @param typeDefinition
      *            TypeDefinition in which should be EnumTypeDefinition found as
@@ -758,10 +651,10 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *         <code>typeDefinition</code> or <code>null</code> in other case
      */
     private def EnumTypeDefinition enumTypeDefFromExtendedType(TypeDefinition<?> typeDefinition) {
-        if(typeDefinition !== null) {
-            if(typeDefinition.baseType instanceof EnumTypeDefinition) {
+        if (typeDefinition !== null) {
+            if (typeDefinition.baseType instanceof EnumTypeDefinition) {
                 return typeDefinition.baseType as EnumTypeDefinition;
-            } else if(typeDefinition.baseType instanceof ExtendedType) {
+            } else if (typeDefinition.baseType instanceof ExtendedType) {
                 return enumTypeDefFromExtendedType(typeDefinition.baseType);
             }
         }
@@ -782,18 +675,16 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *            builder
      * @param typeBuilder
      *            GeneratedTypeBuilder to which will be enum builder assigned
-     * @return enumeration builder which contais data from
+     * @return enumeration builder which contains data from
      *         <code>enumTypeDef</code>
      */
-    private def EnumBuilder resolveInnerEnumFromTypeDefinition(EnumTypeDefinition enumTypeDef, String enumName,
+    private def EnumBuilder resolveInnerEnumFromTypeDefinition(EnumTypeDefinition enumTypeDef, QName enumName,
         GeneratedTypeBuilder typeBuilder) {
-        if((enumTypeDef !== null) && (typeBuilder !== null) && (enumTypeDef.QName !== null) &&
+        if ((enumTypeDef !== null) && (typeBuilder !== null) && (enumTypeDef.QName !== null) &&
             (enumTypeDef.QName.localName !== null)) {
-
-            val enumerationName = parseToClassName(enumName);
+            val enumerationName = BindingMapping.getClassName(enumName);
             val enumBuilder = typeBuilder.addEnumeration(enumerationName);
             enumBuilder.updateEnumPairsFromEnumTypeDef(enumTypeDef);
-
             return enumBuilder;
         }
         return null;
@@ -816,10 +707,8 @@ public class BindingGeneratorImpl implements BindingGenerator {
     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;
-
+        val moduleName = BindingMapping.getClassName(module.name) + postfix;
         return new GeneratedTypeBuilderImpl(packageName, moduleName);
-
     }
 
     /**
@@ -833,10 +722,10 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *            string with the name of the package to which the augmentation
      *            belongs
      * @param augSchema
-     *            AugmentationSchema which is contains data about agumentation
+     *            AugmentationSchema which is contains data about augmentation
      *            (target path, childs...)
-     * @return list of <code>Type</code> objects which contains generated type
-     *         for augmentation and for container, list and choice child nodes
+     * @param module current module
+     * @param parentUsesNode parent uses node of this augment (can be null if this augment is not defined under uses statement)
      * @throws IllegalArgumentException
      *             <ul>
      *             <li>if <code>augmentPackageName</code> equals null</li>
@@ -844,44 +733,347 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *             <li>if target path of <code>augSchema</code> equals null</li>
      *             </ul>
      */
-    private def List<Type> augmentationToGenTypes(String augmentPackageName, AugmentationSchema augSchema) {
+    private def void augmentationToGenTypes(String augmentPackageName, AugmentationSchema augSchema, Module module) {
+        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);
+        val targetPath = augSchema.targetPath;
+        var SchemaNode targetSchemaNode = null
+
+        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 in augmentation " + augSchema + " in module " +
+                        module.name);
+            }
+        }
+        if (targetSchemaNode == null) {
+            throw new IllegalArgumentException("augment target not found: " + targetPath)
+        }
+
+        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;
+            val augTypeBuilder = addRawAugmentGenTypeDefinition(module, packageName, augmentPackageName,
+                targetTypeBuilder.toInstance, augSchema);
+            genCtx.get(module).addAugmentType(augTypeBuilder)
+            genCtx.get(module).addTypeToAugmentation(augTypeBuilder, augSchema);
+        } else {
+            generateTypesFromAugmentedChoiceCases(module, augmentPackageName, targetTypeBuilder.toInstance,
+                targetSchemaNode as ChoiceNode, augSchema.childNodes);
+        }
+    }
+
+    private def void usesAugmentationToGenTypes(String augmentPackageName, AugmentationSchema augSchema, Module module,
+        UsesNode usesNode, DataNodeContainer usesNodeParent) {
         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).");
-        val List<Type> genTypes = new ArrayList();
 
-        // EVERY augmented interface will extends Augmentation<T> interface
-        // and DataObject interface!!!
+        processUsesAugments(augSchema, module);
         val targetPath = augSchema.targetPath;
-        val targetSchemaNode = findDataSchemaNode(schemaContext, targetPath);
-        if(targetSchemaNode !== null) {
-            var targetType = yangToJavaMapping.get(targetSchemaNode.path);
-            if(targetType == null) {
-
-                // FIXME: augmentation should be added as last, all types should already be generated
-                // and have assigned Java Types,
-                val targetModule = findParentModule(schemaContext, targetSchemaNode);
-                val targetBasePackage = moduleNamespaceToPackageName(targetModule);
-                val typePackage = packageNameForGeneratedType(targetBasePackage, targetSchemaNode.getPath());
-                val targetSchemaNodeName = targetSchemaNode.getQName().getLocalName();
-                val typeName = parseToClassName(targetSchemaNodeName);
-                targetType = new ReferencedTypeImpl(typePackage, typeName);
+        var SchemaNode targetSchemaNode = null
+        targetSchemaNode = findOriginalTargetFromGrouping(targetPath, usesNode);
+        if (targetSchemaNode == null) {
+            throw new IllegalArgumentException("augment target not found: " + targetPath)
+        }
+
+        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 (usesNodeParent instanceof SchemaNode) {
+                packageName = packageNameForGeneratedType(augmentPackageName, (usesNodeParent as SchemaNode).path, true)
+            }
+            val augTypeBuilder = addRawAugmentGenTypeDefinition(module, packageName, augmentPackageName,
+                targetTypeBuilder.toInstance, augSchema);
+            genCtx.get(module).addAugmentType(augTypeBuilder)
+            genCtx.get(module).addTypeToAugmentation(augTypeBuilder, augSchema);
+        } else {
+            generateTypesFromAugmentedChoiceCases(module, augmentPackageName, targetTypeBuilder.toInstance,
+                targetSchemaNode as ChoiceNode, augSchema.childNodes);
+        }
+    }
+
+    /**
+     * Utility method which search for original node defined in grouping.
+     */
+    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 QName currentName = node.QName
+        var Object currentNode = node
+        var Object parent = node;
+        val tmpPath = new ArrayList<QName>()
+        val tmpTree = new ArrayList<SchemaNode>()
+
+        var AugmentationSchema augment = null;
+        do {
+            val SchemaPath sp = (parent as SchemaNode).path
+            val List<QName> names = sp.path
+            val List<QName> newNames = new ArrayList(names)
+            newNames.remove(newNames.size - 1)
+            val SchemaPath newSp = new SchemaPath(newNames, sp.absolute)
+            parent = findDataSchemaNode(schemaContext, newSp)
+            if (parent instanceof AugmentationTarget) {
+                tmpPath.add(currentName);
+                tmpTree.add(currentNode as SchemaNode)
+                augment = findNodeInAugment((parent as AugmentationTarget).availableAugmentations, currentName);
+                if (augment == null) {
+                    currentName = (parent as DataSchemaNode).QName
+                    currentNode = parent
+                }
+            }
+        } while ((parent as DataSchemaNode).augmenting && augment == null);
+
+        if (augment == null) {
+            return null;
+        } else {
+            Collections.reverse(tmpPath);
+            Collections.reverse(tmpTree);
+            var Object actualParent = augment;
+            var DataSchemaNode result = null;
+            for (name : tmpPath) {
+                if (actualParent instanceof DataNodeContainer) {
+                    result = (actualParent as DataNodeContainer).getDataChildByName(name.localName);
+                    actualParent = (actualParent as DataNodeContainer).getDataChildByName(name.localName);
+                } else {
+                    if (actualParent instanceof ChoiceNode) {
+                        result = (actualParent as ChoiceNode).getCaseNodeByName(name.localName);
+                        actualParent = (actualParent as ChoiceNode).getCaseNodeByName(name.localName);
+                    }
+                }
+            }
+
+            if (result.addedByUses) {
+                result = findCorrectTargetFromAugmentGrouping(result, augment, tmpTree);
+            }
+
+            return result;
+        }
+    }
+
+    private def AugmentationSchema findNodeInAugment(Collection<AugmentationSchema> augments, QName name) {
+        for (augment : augments) {
+            val DataSchemaNode node = augment.getDataChildByName(name);
+            if (node != null) {
+                return augment;
+            }
+        }
+        return null;
+    }
+
+    private def DataSchemaNode findCorrectTargetFromGrouping(DataSchemaNode node) {
+        if (node.path.path.size == 1) {
+            // uses is under module statement
+            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 QName currentName = node.QName
+            var tmpPath = new ArrayList<QName>()
+            var Object parent = null
+
+            val SchemaPath sp = node.path
+            val List<QName> names = sp.path
+            val List<QName> newNames = new ArrayList(names)
+            newNames.remove(newNames.size - 1)
+            val SchemaPath newSp = new SchemaPath(newNames, sp.absolute)
+            parent = findDataSchemaNode(schemaContext, newSp)
+
+            do {
+                tmpPath.add(currentName);
+                if (parent instanceof DataNodeContainer) {
+                    val dataNodeParent = parent as DataNodeContainer;
+                    for (u : dataNodeParent.uses) {
+                        if (result == null) {
+                            result = getResultFromUses(u, currentName.localName)
+                        }
+                    }
+                }
+                if (result == null) {
+                    currentName = (parent as SchemaNode).QName
+                    if (parent instanceof SchemaNode) {
+                        val SchemaPath nodeSp = (parent as SchemaNode).path
+                        val List<QName> nodeNames = nodeSp.path
+                        val List<QName> nodeNewNames = new ArrayList(nodeNames)
+                        nodeNewNames.remove(nodeNewNames.size - 1)
+                        if (nodeNewNames.empty) {
+                            parent = getParentModule(parent as SchemaNode)
+                        } else {
+                            val SchemaPath nodeNewSp = new SchemaPath(nodeNewNames, nodeSp.absolute)
+                            parent = findDataSchemaNode(schemaContext, nodeNewSp)
+                        }
+                    } else {
+                        throw new IllegalArgumentException("Failed to generate code for augment")
+                    }
+                }
+            } while (result == null && !(parent instanceof Module));
+
+            if (result != null) {
+                result = getTargetNode(tmpPath, result)
+            }
+            return result;
+        }
+    }
+
+    private def DataSchemaNode findCorrectTargetFromAugmentGrouping(DataSchemaNode node, AugmentationSchema parentNode,
+        List<SchemaNode> dataTree) {
+
+        var DataSchemaNode result = null;
+        var QName currentName = node.QName
+        var tmpPath = new ArrayList<QName>()
+        tmpPath.add(currentName)
+        var int i = 1;
+        var Object parent = null
+
+        do {
+            if (dataTree.size < 2 || dataTree.size == i) {
+                parent = parentNode
+            } else {
+                parent = dataTree.get(dataTree.size - (i+1))
+                tmpPath.add((parent as SchemaNode).QName)
+            }
+
+            val dataNodeParent = parent as DataNodeContainer;
+            for (u : dataNodeParent.uses) {
+                if (result == null) {
+                    result = getResultFromUses(u, currentName.localName)
+                }
+            }
+            if (result == null) {
+                i = i + 1
+                currentName = (parent as SchemaNode).QName
+            }
+        } while (result == null);
+
+        if (result != null) {
+            result = getTargetNode(tmpPath, result)
+        }
+        return result;
+    }
+
+    private def getResultFromUses(UsesNode u, String currentName) {
+        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
+        return gr.getDataChildByName(currentName)
+    }
+
+    private def getTargetNode(List<QName> tmpPath, DataSchemaNode node) {
+        var DataSchemaNode result = node
+        if (tmpPath.size == 1) {
+            if (result != null && result.addedByUses) {
+                result = findOriginal(result);
+            }
+            return result;
+        } else {
+            var DataSchemaNode newParent = result;
+            Collections.reverse(tmpPath);
+
+            tmpPath.remove(0);
+            for (name : tmpPath) {
+                // searching by local name is must, because node has different namespace in its original location
+                if (newParent instanceof DataNodeContainer) {
+                    newParent = (newParent as DataNodeContainer).getDataChildByName(name.localName);
+                } else {
+                    newParent = (newParent as ChoiceNode).getCaseNodeByName(name.localName);
+                }
+            }
+            if (newParent != null && newParent.addedByUses) {
+                newParent = findOriginal(newParent);
+            }
+            return newParent;
+        }
+    }
+
+
+    /**
+     * Convenient method to find node added by uses statement.
+     */
+    private def DataSchemaNode findOriginalTargetFromGrouping(SchemaPath targetPath, 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 SchemaNode result = grouping;
+        val List<QName> path = targetPath.path
+        for (node : path) {
+            // finding by local name is valid, grouping cannot contain nodes with same name and different namespace
+            if (result instanceof DataNodeContainer) {
+                result = (result as DataNodeContainer).getDataChildByName(node.localName)
+            } else if (result instanceof ChoiceNode) {
+                result = (result as ChoiceNode).getCaseNodeByName(node.localName)
             }
-            val augChildNodes = augSchema.childNodes;
-            if(!(targetSchemaNode instanceof ChoiceNode)) {
-                val augTypeBuilder = addRawAugmentGenTypeDefinition(augmentPackageName, targetType, augSchema);
-                val augType = augTypeBuilder.toInstance();
-                genTypes.add(augType);
+        }
+        if (result == null) {
+            return null;
+        }
+
+        val String targetSchemaNodeName = result.QName.localName;
+        var boolean fromUses = (result as DataSchemaNode).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 as DataSchemaNode).addedByUses;
             } else {
-                val choiceTarget = targetSchemaNode as ChoiceNode;
-                val choiceCaseNodes = choiceTarget.cases;
-                genTypes.addAll(
-                    generateTypesFromAugmentedChoiceCases(augmentPackageName, targetType, choiceCaseNodes));
+                throw new NullPointerException("Failed to generate code for augment in " + parentUsesNode);
             }
-            genTypes.addAll(augmentationBodyToGenTypes(augmentPackageName, augChildNodes));
         }
-        return genTypes;
+
+        return result as DataSchemaNode
     }
 
     /**
@@ -890,34 +1082,34 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * The name of the type builder is equal to the name of augmented node with
      * serial number as suffix.
      *
+     * @param module current module
      * @param augmentPackageName
      *            string with contains the package name to which the augment
      *            belongs
-     * @param targetPackageName
+     * @param basePackageName
      *            string with the package name to which the augmented node
      *            belongs
-     * @param targetSchemaNodeName
-     *            string with the name of the augmented node
+     * @param targetTypeRef
+     *            target type
      * @param augSchema
      *            augmentation schema which contains data about the child nodes
      *            and uses of augment
      * @return generated type builder for augment
      */
-    private def GeneratedTypeBuilder addRawAugmentGenTypeDefinition(String augmentPackageName, Type targetTypeRef,
-        AugmentationSchema augSchema) {
+    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) {
+        if (augmentBuilders === null) {
             augmentBuilders = new HashMap();
             genTypeBuilders.put(augmentPackageName, augmentBuilders);
         }
         val augIdentifier = getAugmentIdentifier(augSchema.unknownSchemaNodes);
 
-        val augTypeName = if(augIdentifier !== null) {
-                parseToClassName(augIdentifier)
+        val augTypeName = if (augIdentifier !== null) {
+                BindingMapping.getClassName(augIdentifier)
             } else {
                 augGenTypeName(augmentBuilders, targetTypeRef.name);
             }
-        val Set<DataSchemaNode> augChildNodes = augSchema.childNodes;
 
         val augTypeBuilder = new GeneratedTypeBuilderImpl(augmentPackageName, augTypeName);
 
@@ -925,7 +1117,7 @@ public class BindingGeneratorImpl implements BindingGenerator {
         augTypeBuilder.addImplementsType(Types.augmentationTypeFor(targetTypeRef));
         addImplementedInterfaceFromUses(augSchema, augTypeBuilder);
 
-        augSchemaNodeToMethods(augmentPackageName, augTypeBuilder, augChildNodes);
+        augSchemaNodeToMethods(module, basePackageName, augTypeBuilder, augTypeBuilder, augSchema.childNodes);
         augmentBuilders.put(augTypeName, augTypeBuilder);
         return augTypeBuilder;
     }
@@ -938,7 +1130,7 @@ public class BindingGeneratorImpl implements BindingGenerator {
     private def String getAugmentIdentifier(List<UnknownSchemaNode> unknownSchemaNodes) {
         for (unknownSchemaNode : unknownSchemaNodes) {
             val nodeType = unknownSchemaNode.nodeType;
-            if(AUGMENT_IDENTIFIER_NAME.equals(nodeType.localName) &&
+            if (AUGMENT_IDENTIFIER_NAME.equals(nodeType.localName) &&
                 YANG_EXT_NAMESPACE.equals(nodeType.namespace.toString())) {
                 return unknownSchemaNode.nodeParameter;
             }
@@ -946,64 +1138,6 @@ public class BindingGeneratorImpl implements BindingGenerator {
         return null;
     }
 
-    /**
-     * Convert a container, list and choice subnodes (and recursivelly their
-     * subnodes) of augment to generated types
-     *
-     * @param augBasePackageName
-     *            string with the augment package name
-     * @param augChildNodes
-     *            set of data schema nodes which represents child nodes of the
-     *            augment
-     *
-     * @return list of <code>Type</code> which represents container, list and
-     *         choice subnodes of augment
-     */
-    private def List<Type> augmentationBodyToGenTypes(String augBasePackageName, Set<DataSchemaNode> augChildNodes) {
-        val List<Type> genTypes = new ArrayList();
-        val List<DataNodeIterator> augSchemaIts = new ArrayList();
-        for (childNode : augChildNodes) {
-            if(childNode instanceof DataNodeContainer) {
-                augSchemaIts.add(new DataNodeIterator(childNode as DataNodeContainer));
-
-                if(childNode instanceof ContainerSchemaNode) {
-                    genTypes.add(containerToGenType(augBasePackageName, childNode as ContainerSchemaNode));
-                } else if(childNode instanceof ListSchemaNode) {
-                    genTypes.addAll(listToGenType(augBasePackageName, childNode as ListSchemaNode));
-                }
-            } else if(childNode instanceof ChoiceNode) {
-                val choice = childNode as ChoiceNode;
-                for (caseNode : choice.cases) {
-                    augSchemaIts.add(new DataNodeIterator(caseNode));
-                }
-                genTypes.addAll(choiceToGeneratedType(augBasePackageName, childNode as ChoiceNode));
-            }
-        }
-
-        for (it : augSchemaIts) {
-            val List<ContainerSchemaNode> augContainers = it.allContainers();
-            val List<ListSchemaNode> augLists = it.allLists();
-            val List<ChoiceNode> augChoices = it.allChoices();
-
-            if(augContainers !== null) {
-                for (container : augContainers) {
-                    genTypes.add(containerToGenType(augBasePackageName, container));
-                }
-            }
-            if(augLists !== null) {
-                for (list : augLists) {
-                    genTypes.addAll(listToGenType(augBasePackageName, list));
-                }
-            }
-            if(augChoices !== null) {
-                for (choice : augChoices) {
-                    genTypes.addAll(choiceToGeneratedType(augBasePackageName, choice));
-                }
-            }
-        }
-        return genTypes;
-    }
-
     /**
      * Returns first unique name for the augment generated type builder. The
      * generated type builder name for augment consists from name of augmented
@@ -1018,38 +1152,12 @@ public class BindingGeneratorImpl implements BindingGenerator {
      */
     private def String augGenTypeName(Map<String, GeneratedTypeBuilder> builders, String genTypeName) {
         var index = 1;
-        while((builders !== null) && builders.containsKey(genTypeName + index)) {
+        while ((builders !== null) && builders.containsKey(genTypeName + index)) {
             index = index + 1;
         }
         return genTypeName + index;
     }
 
-    /**
-     * Converts <code>containerNode</code> to generated type. Firstly the
-     * generated type builder is created. The subnodes of
-     * <code>containerNode</code> are added as methods and the instance of
-     * <code>GeneratedType</code> is returned.
-     *
-     * @param basePackageName
-     *            string contains the module package name
-     * @param containerNode
-     *            container schema node with the data about childs nodes and
-     *            schema paths
-     * @return generated type for <code>containerNode</code>
-     */
-    private def GeneratedType containerToGenType(String basePackageName, ContainerSchemaNode containerNode) {
-        if(containerNode === null) {
-            return null;
-        }
-
-        val packageName = packageNameForGeneratedType(basePackageName, containerNode.path);
-        val schemaNodes = containerNode.childNodes;
-        val typeBuilder = addDefaultInterfaceDefinition(packageName, containerNode);
-
-        resolveDataSchemaNodes(basePackageName, typeBuilder, schemaNodes);
-        return typeBuilder.toInstance();
-    }
-
     /**
      * Adds the methods to <code>typeBuilder</code> which represent subnodes of
      * node for which <code>typeBuilder</code> was created.
@@ -1057,13 +1165,15 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * The subnodes aren't mapped to the methods if they are part of grouping or
      * augment (in this case are already part of them).
      *
+     * @param module current module
      * @param basePackageName
      *            string contains the module package name
-     * @param typeBuilder
+     * @param parent
      *            generated type builder which represents any node. The subnodes
      *            of this node are added to the <code>typeBuilder</code> as
      *            methods. The subnode can be of type leaf, leaf-list, list,
      *            container, choice.
+     * @param childOf parent type
      * @param schemaNodes
      *            set of data schema nodes which are the children of the node
      *            for which <code>typeBuilder</code> was created
@@ -1071,23 +1181,23 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *         parameter. The getter methods (representing child nodes) could be
      *         added to it.
      */
-    private def GeneratedTypeBuilder resolveDataSchemaNodes(String basePackageName, GeneratedTypeBuilder typeBuilder,
-        Set<DataSchemaNode> schemaNodes) {
-        if((schemaNodes !== null) && (typeBuilder !== null)) {
+    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.isAugmenting() && !schemaNode.isAddedByUses()) {
-                    addSchemaNodeToBuilderAsMethod(basePackageName, schemaNode, typeBuilder);
+                if (!schemaNode.augmenting && !schemaNode.addedByUses) {
+                    addSchemaNodeToBuilderAsMethod(basePackageName, schemaNode, parent, childOf, module);
                 }
-
             }
         }
-        return typeBuilder;
+        return parent;
     }
 
     /**
      * Adds the methods to <code>typeBuilder</code> what represents subnodes of
      * node for which <code>typeBuilder</code> was created.
      *
+     * @param module current module
      * @param basePackageName
      *            string contains the module package name
      * @param typeBuilder
@@ -1095,6 +1205,7 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *            of this node are added to the <code>typeBuilder</code> as
      *            methods. The subnode can be of type leaf, leaf-list, list,
      *            container, choice.
+     * @param childOf parent type
      * @param schemaNodes
      *            set of data schema nodes which are the children of the node
      *            for which <code>typeBuilder</code> was created
@@ -1102,12 +1213,12 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *         parameter <code>typeBuilder</code>. The getter method could be
      *         added to it.
      */
-    private def GeneratedTypeBuilder augSchemaNodeToMethods(String basePackageName, GeneratedTypeBuilder typeBuilder,
-        Set<DataSchemaNode> schemaNodes) {
-        if((schemaNodes !== null) && (typeBuilder !== null)) {
+    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);
+                if (!schemaNode.isAugmenting()) {
+                    addSchemaNodeToBuilderAsMethod(basePackageName, schemaNode, typeBuilder, childOf, module);
                 }
             }
         }
@@ -1120,70 +1231,33 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *
      * @param basePackageName
      *            string with the module package name
-     * @param schemaNode
+     * @param node
      *            data schema node which is added to <code>typeBuilder</code> as
      *            a method
      * @param typeBuilder
      *            generated type builder to which is <code>schemaNode</code>
      *            added as a method.
+     * @param childOf parent type
+     * @param module current module
      */
     private def void addSchemaNodeToBuilderAsMethod(String basePackageName, DataSchemaNode node,
-        GeneratedTypeBuilder typeBuilder) {
-        if(node !== null && typeBuilder !== null) {
+        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:
-                    resolveContainerSchemaNode(basePackageName, typeBuilder, node as ContainerSchemaNode)
+                    containerToGenType(module, basePackageName, typeBuilder, childOf, node as ContainerSchemaNode)
                 case node instanceof ListSchemaNode:
-                    resolveListSchemaNode(basePackageName, typeBuilder, node as ListSchemaNode)
+                    listToGenType(module, basePackageName, typeBuilder, childOf, node as ListSchemaNode)
                 case node instanceof ChoiceNode:
-                    resolveChoiceSchemaNode(basePackageName, typeBuilder, node as ChoiceNode)
+                    choiceToGeneratedType(module, basePackageName, typeBuilder, node as ChoiceNode)
             }
         }
     }
 
-    /**
-     * Creates a getter method for a choice node.
-     *
-     * Firstly generated type builder for choice is created or found in
-     * {@link BindingGeneratorImpl#allGroupings allGroupings}. The package name
-     * in the builder is created as concatenation of module package name and
-     * names of all parent nodes. In the end the getter method for choice is
-     * added to <code>typeBuilder</code> and return type is set to choice
-     * builder.
-     *
-     * @param basePackageName
-     *            string with the module package name
-     * @param typeBuilder
-     *            generated type builder to which is <code>choiceNode</code>
-     *            added as getter method
-     * @param choiceNode
-     *            choice node which is mapped as a getter method
-     * @throws IllegalArgumentException
-     *             <ul>
-     *             <li>if <code>basePackageName</code> equals null</li>
-     *             <li>if <code>typeBuilder</code> equals null</li>
-     *             <li>if <code>choiceNode</code> equals null</li>
-     *             </ul>
-     *
-     */
-    private def void resolveChoiceSchemaNode(String basePackageName, GeneratedTypeBuilder typeBuilder,
-        ChoiceNode choiceNode) {
-        checkArgument(basePackageName !== null, "Base Package Name cannot be NULL.");
-        checkArgument(typeBuilder !== null, "Generated Type Builder cannot be NULL.");
-        checkArgument(choiceNode !== null, "Choice Schema Node cannot be NULL.");
-
-        val choiceName = choiceNode.QName.localName;
-        if(choiceName !== null && !choiceNode.isAddedByUses()) {
-            val packageName = packageNameForGeneratedType(basePackageName, choiceNode.path);
-            val choiceType = addDefaultInterfaceDefinition(packageName, choiceNode);
-            constructGetter(typeBuilder, choiceName, choiceNode.description, choiceType);
-        }
-    }
-
     /**
      * Converts <code>choiceNode</code> to the list of generated types for
      * choice and its cases.
@@ -1192,14 +1266,14 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * concatenation of the module package (<code>basePackageName</code>) and
      * names of all parents node.
      *
+     * @param module current module
      * @param basePackageName
      *            string with the module package name
+     * @param parent parent type
+     * @param childOf concrete parent for case child nodes
      * @param choiceNode
      *            choice node which is mapped to generated type. Also child
      *            nodes - cases are mapped to generated types.
-     * @return list of generated types which contains generated type for choice
-     *         and generated types for all cases which aren't added do choice
-     *         through <i>uses</i>.
      * @throws IllegalArgumentException
      *             <ul>
      *             <li>if <code>basePackageName</code> equals null</li>
@@ -1207,23 +1281,19 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *             </ul>
      *
      */
-    private def List<GeneratedType> choiceToGeneratedType(String basePackageName, ChoiceNode choiceNode) {
+    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 List<GeneratedType> generatedTypes = new ArrayList();
-        val packageName = packageNameForGeneratedType(basePackageName, choiceNode.path);
-        val choiceTypeBuilder = addRawInterfaceDefinition(packageName, choiceNode);
-
-        //choiceTypeBuilder.addImplementsType(DATA_OBJECT);
-        val choiceType = choiceTypeBuilder.toInstance();
-
-        generatedTypes.add(choiceType);
-        val Set<ChoiceCaseNode> caseNodes = choiceNode.cases;
-        if((caseNodes !== null) && !caseNodes.isEmpty()) {
-            generatedTypes.addAll(generateTypesFromChoiceCases(basePackageName, choiceType, caseNodes));
+        if (!choiceNode.addedByUses) {
+            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);
         }
-        return generatedTypes;
     }
 
     /**
@@ -1252,28 +1322,63 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *             </ul>
      *             *
      */
-    private def List<GeneratedType> generateTypesFromChoiceCases(String basePackageName, Type refChoiceType,
-        Set<ChoiceCaseNode> caseNodes) {
+    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(caseNodes !== null, "Set of Choice Case Nodes cannot be NULL.");
+        checkArgument(choiceNode !== null, "ChoiceNode cannot be NULL.");
 
-        val List<GeneratedType> generatedTypes = new ArrayList();
-        for (caseNode : caseNodes) {
-            if(caseNode !== null && !caseNode.isAddedByUses() && !caseNode.isAugmenting()) {
-                val packageName = packageNameForGeneratedType(basePackageName, caseNode.path);
-                val caseTypeBuilder = addDefaultInterfaceDefinition(packageName, caseNode);
-                caseTypeBuilder.addImplementsType(refChoiceType);
+        val Set<ChoiceCaseNode> caseNodes = choiceNode.cases;
+        if (caseNodes == null) {
+            return
+        }
 
-                val Set<DataSchemaNode> childNodes = caseNode.childNodes;
-                if(childNodes !== null) {
-                    resolveDataSchemaNodes(basePackageName, caseTypeBuilder, childNodes);
+        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) {
+                    var Object parentNode = null
+                    val SchemaPath nodeSp = choiceNode.path
+                    val List<QName> nodeNames = nodeSp.path
+                    val List<QName> nodeNewNames = new ArrayList(nodeNames)
+                    nodeNewNames.remove(nodeNewNames.size - 1)
+                    val SchemaPath nodeNewSp = new SchemaPath(nodeNewNames, nodeSp.absolute)
+                    parentNode = findDataSchemaNode(schemaContext, nodeNewSp)
+
+                    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
+                    } else {
+                        val SchemaPath sp = choiceNode.path
+                        val List<QName> names = sp.path
+                        val List<QName> newNames = new ArrayList(names)
+                        newNames.remove(newNames.size - 1)
+                        val SchemaPath newSp = new SchemaPath(newNames, sp.absolute)
+                        parent = findDataSchemaNode(schemaContext, newSp)
+                    }
+                    var GeneratedTypeBuilder childOfType = findChildNodeByPath(parent.path)
+                    resolveDataSchemaNodes(module, basePackageName, caseTypeBuilder, childOfType, caseChildNodes)
                 }
-                generatedTypes.add(caseTypeBuilder.toInstance());
             }
-        }
 
-        return generatedTypes;
+            processUsesAugments(caseNode, module);
+        }
     }
 
     /**
@@ -1301,28 +1406,59 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *             <li>if <code>caseNodes</code> equals null</li>
      *             </ul>
      */
-    private def List<GeneratedType> generateTypesFromAugmentedChoiceCases(String basePackageName, Type refChoiceType,
-        Set<ChoiceCaseNode> caseNodes) {
+    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(refChoiceType !== null, "Referenced Choice Type cannot be NULL.");
-        checkArgument(caseNodes !== null, "Set of Choice Case Nodes cannot be NULL.");
+        checkArgument(targetType !== null, "Referenced Choice Type cannot be NULL.");
+        checkArgument(augmentedNodes !== null, "Set of Choice Case Nodes cannot be NULL.");
 
-        val List<GeneratedType> generatedTypes = new ArrayList();
-        for (caseNode : caseNodes) {
-            if(caseNode !== null && caseNode.isAugmenting()) {
+        for (caseNode : augmentedNodes) {
+            if (caseNode !== null) {
                 val packageName = packageNameForGeneratedType(basePackageName, caseNode.path);
                 val caseTypeBuilder = addDefaultInterfaceDefinition(packageName, caseNode);
-                caseTypeBuilder.addImplementsType(refChoiceType);
+                caseTypeBuilder.addImplementsType(targetType);
+
+                var SchemaNode parent = null
+                val SchemaPath nodeSp = targetNode.path
+                val List<QName> nodeNames = nodeSp.path
+                val List<QName> nodeNewNames = new ArrayList(nodeNames)
+                nodeNewNames.remove(nodeNewNames.size - 1)
+                val SchemaPath nodeNewSp = new SchemaPath(nodeNewNames, nodeSp.absolute)
+                parent = findDataSchemaNode(schemaContext, nodeNewSp)
+
+                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);
+                }
 
-                val Set<DataSchemaNode> childNodes = caseNode.childNodes;
-                if(childNodes !== null) {
-                    resolveDataSchemaNodes(basePackageName, caseTypeBuilder, childNodes);
+                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);
+                    }
                 }
-                generatedTypes.add(caseTypeBuilder.toInstance());
+
+                genCtx.get(module).addCaseType(caseNode.path, caseTypeBuilder)
             }
         }
 
-        return generatedTypes;
     }
 
     /**
@@ -1343,42 +1479,45 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *         </ul>
      */
     private def boolean resolveLeafSchemaNodeAsMethod(GeneratedTypeBuilder typeBuilder, LeafSchemaNode leaf) {
-        if((leaf !== null) && (typeBuilder !== null)) {
+        if ((leaf !== null) && (typeBuilder !== null)) {
             val leafName = leaf.QName.localName;
             var String leafDesc = leaf.description;
-            if(leafDesc === null) {
+            if (leafDesc === null) {
                 leafDesc = "";
             }
 
             val parentModule = findParentModule(schemaContext, leaf);
-            if(leafName !== null && !leaf.isAddedByUses()) {
+            if (leafName !== null && !leaf.isAddedByUses()) {
                 val TypeDefinition<?> typeDef = leaf.type;
 
                 var Type returnType = null;
-                if(typeDef instanceof EnumTypeDefinition) {
+                var GeneratedTOBuilder genTOBuilder;
+                if (typeDef instanceof EnumTypeDefinition) {
                     returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf);
                     val enumTypeDef = typeDef as EnumTypeDefinition;
-                    val enumBuilder = resolveInnerEnumFromTypeDefinition(enumTypeDef, leafName, typeBuilder);
+                    val enumBuilder = resolveInnerEnumFromTypeDefinition(enumTypeDef, leaf.QName, typeBuilder);
 
-                    if(enumBuilder !== null) {
+                    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 UnionType) {
+                    genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, leaf, parentModule);
+                    if (genTOBuilder !== null) {
+                        returnType = createReturnTypeForUnion(genTOBuilder, typeDef, typeBuilder, parentModule)
                     }
-                } else if(typeDef instanceof BitsTypeDefinition) {
-                    val genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, leafName, leaf, parentModule);
-                    if(genTOBuilder !== null) {
+                } else if (typeDef instanceof BitsTypeDefinition) {
+                    genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, leaf, parentModule);
+                    if (genTOBuilder !== null) {
                         returnType = new ReferencedTypeImpl(genTOBuilder.packageName, genTOBuilder.name);
                     }
                 } else {
-                    returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf);
+                    val Restrictions restrictions = BindingGeneratorUtil.getRestrictions(typeDef);
+                    returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf, restrictions);
                 }
-                if(returnType !== null) {
-                    constructGetter(typeBuilder, leafName, leafDesc, returnType);
+                if (returnType !== null) {
+                    val MethodSignatureBuilder getter = constructGetter(typeBuilder, leafName, leafDesc, returnType);
+                    processContextRefExtension(leaf, getter, parentModule);
                     return true;
                 }
             }
@@ -1386,6 +1525,62 @@ public class BindingGeneratorImpl implements BindingGenerator {
         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 = BindingMapping.getClassName(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;
+    }
+
     /**
      * Converts <code>leaf</code> schema node to property of generated TO
      * builder.
@@ -1406,31 +1601,40 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *         </ul>
      */
     private def boolean resolveLeafSchemaNodeAsProperty(GeneratedTOBuilder toBuilder, LeafSchemaNode leaf,
-        boolean isReadOnly) {
-        if((leaf !== null) && (toBuilder !== null)) {
+        boolean isReadOnly, Module module) {
+        if ((leaf !== null) && (toBuilder !== null)) {
             val leafName = leaf.QName.localName;
             var String leafDesc = leaf.description;
-            if(leafDesc === null) {
+            if (leafDesc === null) {
                 leafDesc = "";
             }
 
-            if(leafName !== null) {
+            if (leafName !== null) {
+                var Type returnType = null;
                 val TypeDefinition<?> typeDef = leaf.type;
+                if (typeDef instanceof UnionTypeDefinition) {
+                    // GeneratedType for this type definition should be already created
+                    var qname = typeDef.QName
+                    var Module unionModule = null
+                    if (qname.prefix == null || qname.prefix.empty) {
+                        unionModule = module
+                    } else {
+                        unionModule = findModuleFromImports(module.imports, qname.prefix)
+                    }
+                    val ModuleContext mc = genCtx.get(unionModule)
+                    returnType = mc.typedefs.get(typeDef.path)
+                } else {
+                    returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf);
+                }
 
-                // TODO: properly resolve enum types
-                val returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf);
-
-                if(returnType !== null) {
-                    val propBuilder = toBuilder.addProperty(parseToClassName(leafName));
-
+                if (returnType !== null) {
+                    val propBuilder = toBuilder.addProperty(parseToValidParamName(leafName));
                     propBuilder.setReadOnly(isReadOnly);
                     propBuilder.setReturnType(returnType);
                     propBuilder.setComment(leafDesc);
-
                     toBuilder.addEqualsIdentity(propBuilder);
                     toBuilder.addHashIdentity(propBuilder);
                     toBuilder.addToStringProperty(propBuilder);
-
                     return true;
                 }
             }
@@ -1456,105 +1660,73 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *         </ul>
      */
     private def boolean resolveLeafListSchemaNode(GeneratedTypeBuilder typeBuilder, LeafListSchemaNode node) {
-        if((node !== null) && (typeBuilder !== null)) {
-            val nodeName = node.QName.localName;
+        if ((node !== null) && (typeBuilder !== null)) {
+            val nodeName = node.QName;
             var String nodeDesc = node.description;
-            if(nodeDesc === null) {
+            if (nodeDesc === null) {
                 nodeDesc = "";
             }
+            if (nodeName !== null && !node.isAddedByUses()) {
+                val TypeDefinition<?> typeDef = node.type;
+                val parentModule = findParentModule(schemaContext, node);
 
-            if(nodeName !== null && !node.isAddedByUses()) {
-                val TypeDefinition<?> type = node.type;
-                val listType = Types.listTypeFor(typeProvider.javaTypeForSchemaDefinitionType(type, node));
+                var Type returnType = null;
+                if (typeDef instanceof EnumTypeDefinition) {
+                    returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, node);
+                    val enumTypeDef = typeDef as EnumTypeDefinition;
+                    val enumBuilder = resolveInnerEnumFromTypeDefinition(enumTypeDef, nodeName, typeBuilder);
+                    returnType = new ReferencedTypeImpl(enumBuilder.packageName, enumBuilder.name);
+                    (typeProvider as TypeProviderImpl).putReferencedType(node.path, returnType);
+                } else if (typeDef instanceof UnionType) {
+                    val genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, node, parentModule);
+                    if (genTOBuilder !== null) {
+                        returnType = createReturnTypeForUnion(genTOBuilder, typeDef, typeBuilder, parentModule)
+                    }
+                } else if (typeDef instanceof BitsTypeDefinition) {
+                    val genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, node, parentModule);
+                    returnType = new ReferencedTypeImpl(genTOBuilder.packageName, genTOBuilder.name);
+                } else {
+                    val Restrictions restrictions = BindingGeneratorUtil.getRestrictions(typeDef);
+                    returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, node, restrictions);
+                }
 
-                constructGetter(typeBuilder, nodeName, nodeDesc, listType);
+                val listType = Types.listTypeFor(returnType);
+                constructGetter(typeBuilder, nodeName.localName, nodeDesc, listType);
                 return true;
             }
         }
         return false;
     }
 
-    /**
-     * Creates a getter method for a container node.
-     *
-     * Firstly generated type builder for container is created or found in
-     * {@link BindingGeneratorImpl#allGroupings allGroupings}. The package name
-     * in the builder is created as concatenation of module package name and
-     * names of all parent nodes. In the end the getter method for container is
-     * added to <code>typeBuilder</code> and return type is set to container
-     * type builder.
-     *
-     * @param basePackageName
-     *            string with the module package name
-     * @param typeBuilder
-     *            generated type builder to which is <code>containerNode</code>
-     *            added as getter method
-     * @param containerNode
-     *            container schema node which is mapped as getter method to
-     *            <code>typeBuilder</code>
-     * @return boolean value
-     *         <ul>
-     *         <li>false - if <code>containerNode</code>,
-     *         <code>typeBuilder</code>, container node name equal null or
-     *         <code>containerNode</code> is added by uses</li>
-     *         <li>true - other cases</li>
-     *         </ul>
-     */
-    private def boolean resolveContainerSchemaNode(String basePackageName, GeneratedTypeBuilder typeBuilder,
-        ContainerSchemaNode containerNode) {
-        if((containerNode !== null) && (typeBuilder !== null)) {
-            val nodeName = containerNode.QName.localName;
-
-            if(nodeName !== null && !containerNode.isAddedByUses()) {
-                val packageName = packageNameForGeneratedType(basePackageName, containerNode.path);
-
-                val rawGenType = addDefaultInterfaceDefinition(packageName, containerNode);
-                constructGetter(typeBuilder, nodeName, containerNode.description, rawGenType);
-
-                return true;
-            }
+    private def Type createReturnTypeForUnion(GeneratedTOBuilder genTOBuilder, TypeDefinition<?> typeDef,
+        GeneratedTypeBuilder typeBuilder, Module parentModule) {
+        val Type returnType = new ReferencedTypeImpl(genTOBuilder.packageName, genTOBuilder.name);
+        genTOBuilder.setTypedef(true);
+        genTOBuilder.setIsUnion(true);
+        (typeProvider as TypeProviderImpl).addUnitsToGenTO(genTOBuilder, typeDef.getUnits());
+
+        // union builder
+        val GeneratedTOBuilder unionBuilder = new GeneratedTOBuilderImpl(typeBuilder.getPackageName(),
+            genTOBuilder.getName() + "Builder");
+        unionBuilder.setIsUnionBuilder(true);
+        val MethodSignatureBuilder method = unionBuilder.addMethod("getDefaultInstance");
+        method.setReturnType(returnType);
+        method.addParameter(Types.STRING, "defaultValue");
+        method.setAccessModifier(AccessModifier.PUBLIC);
+        method.setStatic(true);
+
+        val Set<Type> types = (typeProvider as TypeProviderImpl).additionalTypes.get(parentModule);
+        if (types == null) {
+            (typeProvider as TypeProviderImpl).additionalTypes.put(parentModule,
+                Sets.newHashSet(unionBuilder.toInstance))
+        } else {
+            types.add(unionBuilder.toInstance)
         }
-        return false;
+        return returnType
     }
 
-    /**
-     * Creates a getter method for a list node.
-     *
-     * Firstly generated type builder for list is created or found in
-     * {@link BindingGeneratorImpl#allGroupings allGroupings}. The package name
-     * in the builder is created as concatenation of module package name and
-     * names of all parent nodes. In the end the getter method for list is added
-     * to <code>typeBuilder</code> and return type is set to list type builder.
-     *
-     * @param basePackageName
-     *            string with the module package name
-     * @param typeBuilder
-     *            generated type builder to which is <code></code> added as
-     *            getter method
-     * @param listNode
-     *            list schema node which is mapped as getter method to
-     *            <code>typeBuilder</code>
-     * @return boolean value
-     *         <ul>
-     *         <li>false - if <code>listNode</code>, <code>typeBuilder</code>,
-     *         list node name equal null or <code>listNode</code> is added by
-     *         uses</li>
-     *         <li>true - other cases</li>
-     *         </ul>
-     */
-    private def boolean resolveListSchemaNode(String basePackageName, GeneratedTypeBuilder typeBuilder,
-        ListSchemaNode listNode) {
-        if((listNode !== null) && (typeBuilder !== null)) {
-            val listName = listNode.QName.localName;
-
-            if(listName !== null && !listNode.isAddedByUses()) {
-                val packageName = packageNameForGeneratedType(basePackageName, listNode.path);
-                val rawGenType = addDefaultInterfaceDefinition(packageName, listNode);
-                constructGetter(typeBuilder, listName, listNode.description, Types.listTypeFor(rawGenType));
-                return true;
-            }
-        }
-        return false;
+    private def GeneratedTypeBuilder addDefaultInterfaceDefinition(String packageName, SchemaNode schemaNode) {
+        return addDefaultInterfaceDefinition(packageName, schemaNode, null);
     }
 
     /**
@@ -1576,20 +1748,27 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *            <code>schemaNode</code> belongs.
      * @param schemaNode
      *            schema node for which is created generated type builder
+     * @param parent parent type (can be null)
      * @return generated type builder <code>schemaNode</code>
      */
-    private def GeneratedTypeBuilder addDefaultInterfaceDefinition(String packageName, SchemaNode schemaNode) {
-        val builder = addRawInterfaceDefinition(packageName, schemaNode, "");
-        builder.addImplementsType(DATA_OBJECT);
-        if(!(schemaNode instanceof GroupingDefinition)) {
-            builder.addImplementsType(augmentable(builder));
+    private def GeneratedTypeBuilder addDefaultInterfaceDefinition(String packageName, SchemaNode schemaNode,
+        Type parent) {
+        val it = addRawInterfaceDefinition(packageName, schemaNode, "");
+        qnameConstant(BindingMapping.QNAME_STATIC_FIELD_NAME,schemaNode.QName);
+        if (parent === null) {
+            addImplementsType(DATA_OBJECT);
+        } else {
+            addImplementsType(BindingTypes.childOf(parent));
+        }
+        if (!(schemaNode instanceof GroupingDefinition)) {
+            addImplementsType(augmentable(it));
         }
 
-        if(schemaNode instanceof DataNodeContainer) {
-            addImplementedInterfaceFromUses(schemaNode as DataNodeContainer, builder);
+        if (schemaNode instanceof DataNodeContainer) {
+            addImplementedInterfaceFromUses(schemaNode as DataNodeContainer, it);
         }
 
-        return builder;
+        return it;
     }
 
     /**
@@ -1619,13 +1798,14 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *            builder belongs
      * @param schemaNode
      *            schema node which provide data about the schema node name
+     * @param prefix return type name prefix
      * @return generated type builder for <code>schemaNode</code>
      * @throws IllegalArgumentException
      *             <ul>
      *             <li>if <code>schemaNode</code> equals null</li>
      *             <li>if <code>packageName</code> equals null</li>
      *             <li>if Q name of schema node is null</li>
-     *             <li>if schema node name is nul</li>
+     *             <li>if schema node name is null</li>
      *             </ul>
      *
      */
@@ -1638,22 +1818,21 @@ public class BindingGeneratorImpl implements BindingGenerator {
         checkArgument(schemaNodeName !== null, "Local Name of QName for Data Schema Node cannot be NULL.");
 
         var String genTypeName;
-        if(prefix === null) {
-            genTypeName = parseToClassName(schemaNodeName);
+        if (prefix === null) {
+            genTypeName = BindingMapping.getClassName(schemaNodeName);
         } else {
-            genTypeName = prefix + parseToClassName(schemaNodeName);
+            genTypeName = prefix + BindingMapping.getClassName(schemaNodeName);
         }
 
         //FIXME: Validation of name conflict
         val newType = new GeneratedTypeBuilderImpl(packageName, genTypeName);
-        yangToJavaMapping.put(schemaNode.path, newType);
-        if(!genTypeBuilders.containsKey(packageName)) {
+        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)) {
+            if (!builders.containsKey(genTypeName)) {
                 builders.put(genTypeName, newType);
             }
         }
@@ -1665,17 +1844,18 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *
      * @param methodName
      *            string with the name of the getter method
+     * @param returnType return type
      * @return string with the name of the getter method for
      *         <code>methodName</code> in JAVA method format
      */
-    private def String getterMethodName(String methodName, Type returnType) {
+    public static def String getterMethodName(String localName, Type returnType) {
         val method = new StringBuilder();
-        if(BOOLEAN.equals(returnType)) {
+        if (BOOLEAN.equals(returnType)) {
             method.append("is");
         } else {
             method.append("get");
         }
-        method.append(parseToClassName(methodName));
+        method.append(BindingMapping.getPropertyName(localName).toFirstUpper);
         return method.toString();
     }
 
@@ -1702,44 +1882,12 @@ public class BindingGeneratorImpl implements BindingGenerator {
      */
     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;
     }
 
-    private def listToGenType(String basePackageName, ListSchemaNode list) {
-        checkArgument(basePackageName !== null, "Package Name for Generated Type cannot be NULL.");
-        checkArgument(list !== null, "List Schema Node cannot be NULL.");
-
-        val packageName = packageNameForGeneratedType(basePackageName, list.path);
-
-        // val typeBuilder =
-        // resolveListTypeBuilder(packageName, list);
-        val typeBuilder = addDefaultInterfaceDefinition(packageName, list);
-
-        val List<String> listKeys = listKeys(list);
-        val genTOBuilder = resolveListKeyTOBuilder(packageName, list);
-
-        if(genTOBuilder !== null) {
-            val identifierMarker = IDENTIFIER.parameterizedTypeFor(typeBuilder);
-            val identifiableMarker = IDENTIFIABLE.parameterizedTypeFor(genTOBuilder);
-            genTOBuilder.addImplementsType(identifierMarker);
-            typeBuilder.addImplementsType(identifiableMarker);
-        }
-        val schemaNodes = list.childNodes;
-
-        for (schemaNode : schemaNodes) {
-            if(!schemaNode.isAugmenting()) {
-                addSchemaNodeToListBuilders(basePackageName, schemaNode, typeBuilder, genTOBuilder, listKeys);
-            }
-        }
-        return typeBuildersToGenTypes(typeBuilder, genTOBuilder);
-    }
-
     /**
      * Adds <code>schemaNode</code> to <code>typeBuilder</code> as getter method
      * or to <code>genTOBuilder</code> as property.
@@ -1756,6 +1904,7 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *            generated TO builder for the list keys
      * @param listKeys
      *            list of string which contains names of the list keys
+     * @param module current module
      * @throws IllegalArgumentException
      *             <ul>
      *             <li>if <code>schemaNode</code> equals null</li>
@@ -1763,39 +1912,38 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *             </ul>
      */
     private def void addSchemaNodeToListBuilders(String basePackageName, DataSchemaNode schemaNode,
-        GeneratedTypeBuilder typeBuilder, GeneratedTOBuilder genTOBuilder, List<String> listKeys) {
+        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) {
+        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);
+            resolveLeafSchemaNodeAsMethod(typeBuilder, leaf);
+            if (listKeys.contains(leafName)) {
+                resolveLeafSchemaNodeAsProperty(genTOBuilder, leaf, true, module)
+            }
+        } 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);
             }
-        } else if(schemaNode instanceof LeafListSchemaNode) {
-            resolveLeafListSchemaNode(typeBuilder, schemaNode as LeafListSchemaNode);
-        } else if(schemaNode instanceof ContainerSchemaNode) {
-            resolveContainerSchemaNode(basePackageName, typeBuilder, schemaNode as ContainerSchemaNode);
-        } else if(schemaNode instanceof ListSchemaNode) {
-            resolveListSchemaNode(basePackageName, typeBuilder, schemaNode as ListSchemaNode);
         }
     }
 
-    private def typeBuildersToGenTypes(GeneratedTypeBuilder typeBuilder, GeneratedTOBuilder genTOBuilder) {
-        val List<Type> genTypes = new ArrayList();
+    private def typeBuildersToGenTypes(Module module, GeneratedTypeBuilder typeBuilder, GeneratedTOBuilder genTOBuilder) {
         checkArgument(typeBuilder !== null, "Generated Type Builder cannot be NULL.");
 
-        if(genTOBuilder !== null) {
+        if (genTOBuilder !== null) {
             val genTO = genTOBuilder.toInstance();
             constructGetter(typeBuilder, "key", "Returns Primary Key of Yang List Type", genTO);
-            genTypes.add(genTO);
+            genCtx.get(module).addGeneratedTOBuilder(genTOBuilder)
         }
-        genTypes.add(typeBuilder.toInstance());
-        return genTypes;
     }
 
     /**
@@ -1811,7 +1959,7 @@ public class BindingGeneratorImpl implements BindingGenerator {
     private def listKeys(ListSchemaNode list) {
         val List<String> listKeys = new ArrayList();
 
-        if(list.keyDefinition !== null) {
+        if (list.keyDefinition !== null) {
             val keyDefinitions = list.keyDefinition;
             for (keyDefinition : keyDefinitions) {
                 listKeys.add(keyDefinition.localName);
@@ -1834,15 +1982,12 @@ public class BindingGeneratorImpl implements BindingGenerator {
      */
     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);
-            }
+        if ((list.keyDefinition !== null) && (!list.keyDefinition.isEmpty())) {
+            val listName = list.QName.localName + "Key";
+            val String genTOName = BindingMapping.getClassName(listName);
+            genTOBuilder = new GeneratedTOBuilderImpl(packageName, genTOName);
         }
         return genTOBuilder;
-
     }
 
     /**
@@ -1864,24 +2009,42 @@ public class BindingGeneratorImpl implements BindingGenerator {
      *            from <code>typeDef</code>
      * @param leafName
      *            string with name for generated TO builder
+     * @param leaf
+     * @param parentModule
      * @return generated TO builder for <code>typeDef</code>
      */
     private def GeneratedTOBuilder addTOToTypeBuilder(TypeDefinition<?> typeDef, GeneratedTypeBuilder typeBuilder,
-        String leafName, LeafSchemaNode leaf, Module parentModule) {
-        val classNameFromLeaf = parseToClassName(leafName);
+        DataSchemaNode leaf, Module parentModule) {
+        val classNameFromLeaf = BindingMapping.getClassName(leaf.QName);
         val List<GeneratedTOBuilder> genTOBuilders = new ArrayList();
         val packageName = typeBuilder.fullyQualifiedName;
-        if(typeDef instanceof UnionTypeDefinition) {
-            genTOBuilders.addAll(
-                (typeProvider as TypeProviderImpl).
+        if (typeDef instanceof UnionTypeDefinition) {
+            val List<GeneratedTOBuilder> types = (typeProvider as TypeProviderImpl).
                     provideGeneratedTOBuildersForUnionTypeDef(packageName, (typeDef as UnionTypeDefinition),
-                        classNameFromLeaf, leaf));
-        } else if(typeDef instanceof BitsTypeDefinition) {
+                        classNameFromLeaf, leaf); 
+            genTOBuilders.addAll(types);
+                        
+            
+        var GeneratedTOBuilder resultTOBuilder = null;
+        if (!types.isEmpty()) {
+            resultTOBuilder = types.remove(0);
+            for (GeneratedTOBuilder genTOBuilder : types) {
+                resultTOBuilder.addEnclosingTransferObject(genTOBuilder);
+            }
+        }
+
+        val GeneratedPropertyBuilder genPropBuilder = resultTOBuilder.addProperty("value");
+        genPropBuilder.setReturnType(Types.primitiveType("char[]", null));
+        resultTOBuilder.addEqualsIdentity(genPropBuilder);
+        resultTOBuilder.addHashIdentity(genPropBuilder);
+        resultTOBuilder.addToStringProperty(genPropBuilder);
+
+        } else if (typeDef instanceof BitsTypeDefinition) {
             genTOBuilders.add(
                 ((typeProvider as TypeProviderImpl) ).
                     provideGeneratedTOBuilderForBitsTypeDefinition(packageName, typeDef, classNameFromLeaf));
         }
-        if(genTOBuilders !== null && !genTOBuilders.isEmpty()) {
+        if (genTOBuilders !== null && !genTOBuilders.isEmpty()) {
             for (genTOBuilder : genTOBuilders) {
                 typeBuilder.addEnclosingTransferObject(genTOBuilder);
             }
@@ -1895,7 +2058,7 @@ public class BindingGeneratorImpl implements BindingGenerator {
      * Adds the implemented types to type builder.
      *
      * The method passes through the list of <i>uses</i> in
-     * {@code dataNodeContainer}. For every <i>use</i> is obtained coresponding
+     * {@code dataNodeContainer}. For every <i>use</i> is obtained corresponding
      * generated type from {@link BindingGeneratorImpl#allGroupings
      * allGroupings} which is added as <i>implements type</i> to
      * <code>builder</code>
@@ -1909,9 +2072,9 @@ public class BindingGeneratorImpl implements BindingGenerator {
      */
     private def addImplementedInterfaceFromUses(DataNodeContainer dataNodeContainer, GeneratedTypeBuilder builder) {
         for (usesNode : dataNodeContainer.uses) {
-            if(usesNode.groupingPath !== null) {
-                val genType = allGroupings.get(usesNode.groupingPath);
-                if(genType === null) {
+            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);
                 }
@@ -1920,4 +2083,46 @@ public class BindingGeneratorImpl implements BindingGenerator {
         }
         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
+    }
+
+    private def Module getParentModule(SchemaNode node) {
+        val QName qname = node.getPath().getPath().get(0);
+        val URI namespace = qname.getNamespace();
+        val Date revision = qname.getRevision();
+        return schemaContext.findModuleByNamespaceAndRevision(namespace, revision);
+    }
+
+    public def getModuleContexts() {
+        genCtx;
+    }
+
 }