diff --git a/CHANGELOG.md b/CHANGELOG.md
index d14f77c2..d5f98c6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 0.3.0 (September 24, 2021)
+
+BUG FIXES:
+- Fix mso_schema_site_anp_epg Import when VRF or BD is not configured
+
+IMPROVEMENTS:
+- Added new resource mso_schema_site_external_epg
+- Updated mso_user to support MSO/ND platform
+- Updated resource and  datasource mso_site to work with ND-based MSO / NDO
+- Updated mso_schema_template_contract to support multiple filter_relationship and deprecate filter_relationships attribute.
+
 ## 0.2.1 (July 20, 2021)
 
 BUG FIXES:
diff --git a/website/docs/d/schema_template_service_graph.html.markdown b/website/docs/d/schema_template_service_graph.html.markdown
index cc511db3..76dc83b3 100644
--- a/website/docs/d/schema_template_service_graph.html.markdown
+++ b/website/docs/d/schema_template_service_graph.html.markdown
@@ -31,7 +31,7 @@ data "mso_schema_template_service_graph" "test_sg" {
 
 ## Attribute Reference ##
 
-* `service_node_type` - (Optional) Type of Service Node attached to this Graph at index provided by `node_index`.
+* `service_node_type` - (Optional) Type of Service Node attached to this Graph at index provided by `node_index`. Allowed values are `firewall`, `load-balancer` , `other`.
 * `site_nodes` - (Optional) List of maps to Hold Site level Node association. 
 * `site_nodes.site_id` - (Optional) Site-Id Attached with the template. Where Service Graph is created. 
 * `site_nodes.tenant_name` - (Optional) Name of Tenant holding the Service Node. 
diff --git a/website/docs/d/user.html.markdown b/website/docs/d/user.html.markdown
index 9cc39ed3..2df1c4d5 100644
--- a/website/docs/d/user.html.markdown
+++ b/website/docs/d/user.html.markdown
@@ -25,12 +25,12 @@ data "mso_user" "schema10" {
 ## Attribute Reference ##
 
 * `user_password` - (Optional) password of the user. It must contain at least 8 characters in length.
-* `roles` - (Optional) roles given to the user. This attribute is deprecated on ND-based MSO/NDO, use `user_rbac` instead.
-* `roles.roleid` - (Optional) id of roles given to the user. This attribute is deprecated on ND-based MSO/NDO, use `user_rbac` instead.
-* `roles.access_type` - (Optional) access_type of roles given to the user. This attribute is deprecated on ND-based MSO/NDO, use `user_rbac` instead.
+* `roles` - **Deprecated** (Optional) roles given to the user. This attribute is deprecated on ND-based MSO/NDO, use `user_rbac` instead.
+  * `roles.roleid` - (Optional) id of roles given to the user.
+  * `roles.access_type` - (Optional) access_type of roles given to the user.
 * `user_rbac` - (Optional) roles given to the user.
-* `user_rbac.name` - (Optional) name of roles given to the user.
-* `user_rbac.user_priv` - (Optional) Privilege access given to users (WritePriv, ReadPriv)
+  * `user_rbac.name` - (Optional) name of roles given to the user.
+  * `user_rbac.user_priv` - (Optional) Privilege access given to users (WritePriv, ReadPriv)
 * `first_name` - (Optional) firstname of the user.
 * `last_name` - (Optional) lastname of the user.
 * `email` - (Optional) email of the user.
diff --git a/website/docs/r/schema_template_service_graph.html.markdown b/website/docs/r/schema_template_service_graph.html.markdown
index 5c1db424..ce29da62 100644
--- a/website/docs/r/schema_template_service_graph.html.markdown
+++ b/website/docs/r/schema_template_service_graph.html.markdown
@@ -33,7 +33,7 @@ resource "mso_schema_template_service_graph" "test_sg" {
 * `schema_id` - (Required) Schema ID where Service Graph to be created.
 * `template_name` - (Required) Template Name where Service Graph to be created.
 * `service_graph_name` - (Required) Name of Service Graph.
-* `service_node_type` - (Required) Type of Service Node attached to this Graph.
+* `service_node_type` - (Required) Type of Service Node attached to this Graph. Allowed values are `firewall`, `load-balancer` , `other`.
 * `description` - (Optional) Description of Service Graph.
 * `site_nodes` - (Optional) List of maps to provide Site level Node association. This maps should be provided if site is associated with template.
 * `site_nodes.site_id` - (Optional) Site-Id Attached with the template. Where Service Graph will be created. This parameter is required when site is attached with the Template.
diff --git a/website/docs/r/user.html.markdown b/website/docs/r/user.html.markdown
index e2973b3f..e5c346ca 100644
--- a/website/docs/r/user.html.markdown
+++ b/website/docs/r/user.html.markdown
@@ -36,8 +36,12 @@ resource "mso_user" "user1" {
 
 * `username` - (Required) username of the user. It must contain at least 1 character in length.
 * `user_password` - (Required) password of the user. It must contain at least 8 characters in length.
-* `roles` - (Required) roles given to the user.
-* `roles.roleid` - (Required) id of roles given to the user.
+* `roles` - **Deprecated** (Optional) roles given to the user. This attribute is deprecated on ND-based MSO/NDO, use `user_rbac` instead.
+  * `roles.roleid` - (Optional) id of roles given to the user.
+  * `roles.access_type` - (Optional) access_type of roles given to the user.
+* `user_rbac` - (Optional) roles given to the user.
+  * `user_rbac.name` - (Optional) name of roles given to the user.
+  * `user_rbac.user_priv` - (Optional) Privilege access given to users (WritePriv, ReadPriv)
 * `first_name` - (Optional) firstname of the user.
 * `last_name` - (Optional) lastname of the user.
 * `email` - (Optional) email of the user.