diff --git a/src/lang/extensions.coffee b/src/lang/extensions.coffee
index 1fda738..f7f2aef 100644
--- a/src/lang/extensions.coffee
+++ b/src/lang/extensions.coffee
@@ -177,8 +177,10 @@ module.exports = [
     argument: 'condition'
     data: true
     scope:
+      anydata:      '0..n'
       anyxml:       '0..n'
       case:         '0..n'
+      choice:       '0..n'
       config:       '0..1'
       container:    '0..n'
       default:      '0..1'
@@ -306,13 +308,13 @@ module.exports = [
     argument: 'value'
     scope:
       config:         '0..1'
-      default:        '0..1'
+      default:        '0..n'
       mandatory:      '0..1'
       'max-elements': '0..1'
       'min-elements': '0..1'
       must:           '0..n'
       type:           '0..1'
-      unique:         '0..1'
+      unique:         '0..n'
       units:          '0..1'
 
   # TODO
@@ -424,8 +426,9 @@ module.exports = [
   new Extension 'identity',
     argument: 'name'
     scope:
-      base:        '0..1'
+      base:        '0..n'
       description: '0..1'
+      'if-feature':'0..n' # YANG 1.1
       reference:   '0..1'
       status:      '0..1'
     # TODO: resolve 'base' statements
@@ -665,7 +668,7 @@ module.exports = [
       reference:    '0..1'
       status:       '0..1'
       typedef:      '0..n'
-      unique:       '0..1'
+      unique:       '0..n'
       uses:         '0..n'
       when:         '0..1'
 
@@ -943,6 +946,7 @@ module.exports = [
   new Extension 'submodule',
     argument: 'name'
     scope:
+      anydata:        '0..n'
       anyxml:         '0..n'
       augment:        '0..n'
       'belongs-to':   '0..1'
@@ -972,7 +976,7 @@ module.exports = [
   new Extension 'type',
     argument: 'name'
     scope:
-      base:               '0..1'
+      base:               '0..n'
       bit:                '0..n'
       enum:               '0..n'
       'fraction-digits':  '0..1'