diff --git a/templates/infra-crt-NSO.config b/templates/infra-crt-NSO.config
index 6520865..b6a7a93 100644
--- a/templates/infra-crt-NSO.config
+++ b/templates/infra-crt-NSO.config
@@ -6,7 +6,7 @@ Protocols for the Lo0.0 are automatically handled by the common packages
 {%- for loopback, unit in interfaces["loopback-interface"]["lo0"]["units"].items() %}
 set services infra-crt {{device}} interface loopback-interface lo0 {{unit["name"]}} skip-loopback-check true
 {%- if unit["description"] is not none %}
-set services infra-crt {{device}} interface loopback-interface lo0 {{unit["name"]}} description {{unit["description"]}}
+set services infra-crt {{device}} interface loopback-interface lo0 {{unit["name"]}} description "{{unit["description"]}}"
 {%- else %}
 ERROR: Missing Description for Lo0 unit {{unit["name"]}}!!!
 set services infra-crt {{device}} interface loopback-interface lo0 {{unit["name"]}} description "FIX_ME"
@@ -45,13 +45,21 @@ ERROR: IP Addressing Missing for {{aggregate_interface["name"]}} unit {{aggregat
 set services infra-crt {{device}} interface aggregate-interface {{ae_num}} {{aggregate_unit["name"]}} ipv4 FIX_ME
 {%- endif %}
 {%- if aggregate_interface["description"] is not none %}
-set services infra-crt {{device}} interface aggregate-interface {{ae_num}} {{aggregate_unit["name"]}} description {{aggregate_interface["description"]}}
+set services infra-crt {{device}} interface aggregate-interface {{ae_num}} {{aggregate_unit["name"]}} description "{{aggregate_interface["description"]}}"
 {%- else %}
 ERROR: Missing Description for {{aggregate_interface["name"]}} unit {{aggregate_unit["name"]}}!!!
 set services infra-crt {{device}} interface aggregate-interface {{ae_num}} {{aggregate_unit["name"]}} description FIX_ME
 {%- endif %}
-{#- Find Protocols for AE #}
-{#- ISIS#}
+{%- for key,member_interface in aggregate_interface["member-interface"].items() %}
+{%- if member_interface["description"] is not none %}
+set services infra-crt {{device}} interface aggregate-interface {{ae_num}} 0 core-interface {{member_interface["name"]}} description "{{member_interface["description"]}}"
+{%- else %}
+ERROR: Missing Description for {{aggregate_interface["name"]}} Member-interface {{member_interface["name"]}}!!!
+set services infra-crt {{device}} interface aggregate-interface {{ae_num}} 0 core-interface {{member_interface["name"]}} description FIX_ME
+{%- endif %}
+{%- endfor %}
+{# Find Protocols for AE #}
+{#- ISIS #}
 {%- if aggregate_unit["isis-passive"] == True %}
 set services infra-crt {{device}} isis passive-interface name {{aggregate_interface["name"]}} {{aggregate_unit["name"]}}
 {%- else %}
@@ -71,7 +79,7 @@ set services infra-crt {{device}} ldp core-interface name {{aggregate_interface[
 {#- MPLS-TE #}
 {%- if aggregate_unit["mpls"] == True %}
 {%- if aggregate_unit["mpls-te-att-names"] is not none %}
-set services infra-crt {{device}} mpls-te core-interface name {{aggregate_interface["name"]}} {{aggregate_unit["name"]}} mpls-te-att-names {{aggregate_unit["mpls-te-att-names"]}}
+set services infra-crt {{device}} mpls-te core-interface name {{aggregate_interface["name"]}} {{aggregate_unit["name"]}} mpls-te-att-names [ {{aggregate_unit["mpls-te-att-names"] | join(' ')}} ]
 {%- else %}
 set services infra-crt {{device}} mpls-te core-interface name {{aggregate_interface["name"]}} {{aggregate_unit["name"]}}
 {%- endif %}
@@ -100,14 +108,7 @@ set services infra-crt {{device}} service-policy core-interface name {{aggregate
 {%- endif %}
 {%- endif %}
 {%- endfor %}
-{%- for key,member_interface in aggregate_interface["member-interface"].items() %}
-{%- if member_interface["description"] is not none %}
-set services infra-crt {{device}} interface aggregate-interface {{ae_num}} 0 core-interface {{member_interface["name"]}} description {{member_interface["description"]}}
-{%- else %}
-ERROR: Missing Description for {{aggregate_interface["name"]}} Member-interface {{member_interface["name"]}}!!!
-set services infra-crt {{device}} interface aggregate-interface {{ae_num}} 0 core-interface {{member_interface["name"]}} description FIX_ME
-{%- endif %}
-{%- endfor %}
+
 {%- endif %}
 {%- endfor %}
 
@@ -117,7 +118,7 @@ set services infra-crt {{device}} interface aggregate-interface {{ae_num}} 0 cor
 {% for key,core_unit in core_interface["units"].items() %}
 {%- if core_unit["disabled"] == False %}
 {%- if core_interface["description"] is not none %}
-set services infra-crt {{device}} interface core-interface name {{core_interface["name"]}} {{core_unit["name"]}} description {{core_interface["description"]}}
+set services infra-crt {{device}} interface core-interface name {{core_interface["name"]}} {{core_unit["name"]}} description "{{core_interface["description"]}}"
 {%- endif %}
 {%- if core_interface["description"] is none %}
 set services infra-crt {{device}} interface core-interface name {{core_interface["name"]}} {{core_unit["name"]}} description FIX_ME
@@ -154,7 +155,7 @@ set services infra-crt {{device}} ldp core-interface name {{core_interface["name
 {#- MPLS-TE #}
 {%- if core_unit["mpls"] == True %}
 {%- if none not in core_unit["mpls-te-att-names"] %}
-set services infra-crt {{device}} mpls-te core-interface name {{core_interface["name"]}} {{core_unit["name"]}} mpls-te-att-names {{core_unit["mpls-te-att-names"]}}
+set services infra-crt {{device}} mpls-te core-interface name {{core_interface["name"]}} {{core_unit["name"]}} mpls-te-att-names [ {{core_unit["mpls-te-att-names"] | join(' ')}} ]
 {%- else %}
 set services infra-crt {{device}} mpls-te core-interface name {{core_interface["name"]}} {{core_unit["name"]}}
 {%- endif %}