diff --git a/docs/sections/images/DFC_config.png b/docs/sections/images/DFC_config.png
new file mode 100644
index 0000000..517c6c9
--- /dev/null
+++ b/docs/sections/images/DFC_config.png
Binary files differ
diff --git a/docs/sections/services/dfc/architecture.rst b/docs/sections/services/dfc/architecture.rst
index f25b855..5592bf2 100644
--- a/docs/sections/services/dfc/architecture.rst
+++ b/docs/sections/services/dfc/architecture.rst
@@ -40,4 +40,10 @@
 (DR).
 Both fetching of a file and publishing is retried a number of times with an increasing delay between each attempt.
 After a number of attempts, the DFC will log an error message and give up. Failing of processing of one file does not
-affect the handling of others.
\ No newline at end of file
+affect the handling of others.
+
+Generalized  DFC
+""""""""""""""""
+From version 1.2.1 and onwards, the DFC has more general use. Instead of only managing PM files, any kind of files
+are handled. The 'changeIdentifier' parameter in the file ready VES event (which is reported from the PNFs) is used
+to define the file type of file to be handled.
\ No newline at end of file
diff --git a/docs/sections/services/dfc/configuration.rst b/docs/sections/services/dfc/configuration.rst
index 76e822e..bb60fa2 100644
--- a/docs/sections/services/dfc/configuration.rst
+++ b/docs/sections/services/dfc/configuration.rst
@@ -1,120 +1,230 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 
+=============================
 Configuration and Performance
 =============================
 
-**datafile** configuration is controlled via a single JSON file called datafile_endpoints.json.
-This is located under datafile-app-server/config.
+Configuration
+^^^^^^^^^^^^^
+By default, DFC handles the "PM_MEAS_FILES" change identifier and publishes these files on the "bulk_pm_feed" feed.
+But it can also be configured to handle other change identifiers and publish them to other feeds, see picture below.
 
-Json Configuration Explained
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. image:: ../../images/DFC_config.png
 
-Variables of interest (e.g. variables that should be inspected/modified for a specific runtime environment) are listed below for convenience.  The entire file is provided later in this page for reference.
+The configuration of DFC is controlled via a blueprint.
 
-dmaapConsumerConfiguration
-""""""""""""""""""""""""""
+Blueprint Configuration Explained
+"""""""""""""""""""""""""""""""""
 
-.. code-block:: json
+For the communication with the Message Router, the user must provide the **host name**, **port**, and **protocol** of the DMaaP Message router.
 
-  "dmaapHostName": <name of DMaaP/MR host>
-  "dmaapPortNumber": <DMaaP/MR host port>
-  "dmaapTopicName": "/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
-  "dmaapProtocol": "http"
-  "dmaapUserName": ""
-  "dmaapUserPassword": ""
-  "dmaapContentType": "application/json"
-  "consumerId": "C12"
-  "consumerGroup": "OpenDcae-c12"
-  "timeoutMS": -1
-  "messageLimit": 1
+.. code-block:: yaml
+  :emphasize-lines: 2,6,10
 
-dmaapProducerConfiguration
-""""""""""""""""""""""""""
+    inputs:
+      dmaap_mr_host:
+        type: string
+        description: dmaap messagerouter host
+        default: message-router.onap.svc.cluster.local
+      dmaap_mr_port:
+        type: integer
+        description: dmaap messagerouter port
+        default: 3904
+      dmaap_mr_protocol:
+        type: string
+        description: dmaap messagerouter protocol
+        default: "http"
 
-.. code-block:: json
+The user can also specify which version of DFC to use.
 
-  "dmaapHostName": <name of DMaaP/DR host>
-  "dmaapPortNumber": <DMaaP/DR host port>
-  "dmaapTopicName": "publish"
-  "dmaapProtocol": "https"
-  "dmaapUserName": "dradmin"
-  "dmaapUserPassword": "dradmin"
-  "dmaapContentType": "application/octet-stream"
+.. code-block:: yaml
+  :emphasize-lines: 2
 
-ftpesConfiguration
-""""""""""""""""""
+    inputs:
+      tag_version:
+        type: string
+        description: DFC image tag/version
+        default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.2.0"
 
-.. code-block:: json
+The user can also enable secure communication with the DMaaP Message Router.
 
-  "keyCert": <path to DFC certificate>
-  "keyPassword": <password for DFC certificate>
-  "trustedCa": <path to xNF certificate>
-  "trustedCaPassword": <password for xNF certificate>
+.. code-block:: yaml
+  :emphasize-lines: 2
 
-securityConfiguration
-"""""""""""""""""""""
+    inputs:
+      secureEnableCert:
+        type: boolean
+        description: enable certificate based connection with DMaap
+        default: false
 
-.. code-block:: json
+DFC can handle multiple change identifiers. This will require to create manually a new block for each change identifier.
 
-  "trustStorePath": <path to trust store>
-  "trustStorePasswordPath": <path to trust store password>
-  "keyStorePath": <path to key store>
-  "keyStorePasswordPath": <path to key store password>
-  "enableDmaapCertAuth": <boolean>. If false, all information above are ignored.
+.. code-block:: yaml
+  :emphasize-lines: 2
+  
+    streams_publishes:
+      dfcFeed00ChangeIdentifier:
+        dmaap_info: <<bulk_pm_feed>>
+        type: data_router
 
+For each feed related to a change identifier the user must provide the **feed name**, and **feed description**.
 
+.. code-block:: yaml
+  :emphasize-lines: 2,6
 
-Sample JSON configuration
-"""""""""""""""""""""""""
+    inputs:
+      dfcFeed00Name:
+        type: string
+        description: The name of the feed the files will be published to. Should be used by the subscriber.
+        default: "bulk_pm_feed"
+      dfcFeed00Description:
+        type: string
+        description: A description of the feed the files will be published to.
+        default: "Feed for Bulk PM files"
 
-The format of the JSON configuration that drives all behavior of DFC is probably best described using an example:
+**Note!** The feed name provided should be used by the subscriber/s to set up the subscription to the feed.
 
-.. code-block:: json
+To dynamically create the feeds, DFC uses the DCAE DMaaP plugin. This means that for each feed the user must also add an
+item under the "**node_templates**" section of the blueprint. The feed is identified within the blueprint with a feed identifier, "**dfcFeed00**" in the example.
 
-  {
-    "configs": {
-      "dmaap": {
-        "dmaapConsumerConfiguration": {
-          "dmaapHostName": "localhost",
-          "dmaapPortNumber": 2222,
-          "dmaapTopicName": "/events/unauthenticated.VES_NOTIFICATION_OUTPUT",
-          "dmaapProtocol": "http",
-          "dmaapUserName": "",
-          "dmaapUserPassword": "",
-          "dmaapContentType": "application/json",
-          "consumerId": "C12",
-          "consumerGroup": "OpenDcae-c12",
-          "timeoutMS": -1,
-          "messageLimit": 1
-        },
-        "dmaapProducerConfiguration": {
-          "dmaapHostName": "localhost",
-          "dmaapPortNumber": 3907,
-          "dmaapTopicName": "publish",
-          "dmaapProtocol": "https",
-          "dmaapUserName": "dradmin",
-          "dmaapUserPassword": "dradmin",
-          "dmaapContentType": "application/octet-stream"
-        }
-      },
-      "ftp": {
-            "ftpesConfiguration": {
-                "keyCert": "config/dfc.jks",
-                "keyPassword": "secret",
-                "trustedCa": "config/ftp.jks",
-                "trustedCaPassword": "secret"
-            }
-      },
-        "security": {
-            "trustStorePath" : "change it",
-            "trustStorePasswordPath" : "change it",
-            "keyStorePath" : "change it",
-            "keyStorePasswordPath" : "change it",
-            "enableDmaapCertAuth" : "false"
-        }
-    }
-  }
+.. code-block:: yaml
+  :emphasize-lines: 2
+
+    node_templates:
+      dfcFeed00:
+        type: ccsdk.nodes.Feed
+        properties:
+          feed_name: { get_input: dfcFeed00Name }
+          feed_description: { get_input: dfcFeed00Description }
+
+To configure DFC micro service itself, the user must also add the change identifier and the feed identifier to the "**application_config**" section
+under the tag "**dmaap.dmaapProducerConfiguration**" in the blueprint. **Note!** The identifier should be surrounded by **<<>>** for the feed's configuration to be bound to the DFC configuration in CBS.
+
+.. code-block:: yaml
+  :emphasize-lines: 4
+
+          application_config:
+            dmaap.dmaapProducerConfiguration:
+              - changeIdentifier: {get_input: dfcFeed00ChangeIdentifier}
+                feedInfo: <<dfcFeed00>>
+
+And, lastly, to set up the publication to the feed, the feed identifier must be added to the "**streams_publishes**" section
+of the blueprint.
+
+.. code-block:: yaml
+  :emphasize-lines: 2
+
+          streams_publishes:
+            - name: dfcFeed00
+              type: data_router
+              location: "loc00"
+
+Sample blueprint configuration
+""""""""""""""""""""""""""""""
+
+The format of the blueprint configuration that drives all behavior of DFC is probably best described using an example.
+The blueprint below configures DFC to handle the two feeds shown in the picture above.
+
+.. code-block:: yaml
+
+    inputs:
+      dmaap_mr_host:
+        type: string
+        description: dmaap messagerouter host
+        default: message-router.onap.svc.cluster.local
+      dmaap_mr_port:
+        type: integer
+        description: dmaap messagerouter port
+        default: 3904
+      dmaap_mr_protocol:
+        type: string
+        description: dmaap messagerouter protocol
+        default: "http"
+      tag_version:
+        type: string
+        description: DFC image tag/version
+        default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.2.0"
+      replicas:
+        type: integer
+        description: number of instances
+        default: 1
+      secureEnableCert:
+        type: boolean
+        description: enable certificate based connection with DMaap
+        default: false
+      dfcFeed00Name:
+        type: string
+        description: The name of the feed the files will be published to. Should be used by the subscriber.
+        default: "bulk_pm_feed"
+      dfcFeed00Description:
+        type: string
+        description: A description of the feed the files will be published to.
+        default: "Feed for Bulk PM files"
+      dfcFeed01Name:
+        type: string
+        description: The name of the feed the files will be published to. Should be used by the subscriber.
+        default: "log_feed"
+      dfcFeed01Description:
+        type: string
+        description: A description of the feed the files will be published to.
+        default: "Feed for log files"
+
+    node_templates:
+      dfcFeed00:
+        type: ccsdk.nodes.Feed
+        properties:
+          feed_name: { get_input: dfcFeed00Name }
+          feed_description: { get_input: dfcFeed00Description }
+      dfcFeed01:
+        type: ccsdk.nodes.Feed
+        properties:
+          feed_name: { get_input: dfcFeed01Name }
+          feed_description: { get_input: dfcFeed01Description }
+
+      datafile-collector:
+        type: dcae.nodes.ContainerizedServiceComponentUsingDmaap
+
+        relationships:
+          - type: ccsdk.relationships.publish_files
+            target: dfcFeed00
+          - type: ccsdk.relationships.publish_files
+            target: dfcFeed01
+
+        interfaces:
+          cloudify.interfaces.lifecycle:
+            start:
+              inputs:
+                ports:
+                  - concat: ["8100:0"]
+                  - concat: ["8433:0"]
+
+        properties:
+          service_component_type: 'dcae-datafile'
+          application_config:
+            dmaap.security.enableDmaapCertAuth: { get_input: secureEnableCert }
+            streams_publishes:
+              dfcFeed00ChangeIdentifier:
+                dmaap_info: <<dfcFeed00>>
+                type: data_router
+              dfcFeed01ChangeIdentifier:
+                dmaap_info: <<dfcFeed01>>
+                type: data_router
+            streams_subscribes:
+              dmaap_subscriber:
+                type:
+                  "message_router"
+                dmaap_info:
+                  topic_url:
+                    { concat: [{ get_input: dmaap_mr_protocol },"://",{ get_input: dmaap_mr_host },
+                               ":",{ get_input: dmaap_mr_port },"/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"]}
+          streams_publishes:
+            - name: dfcFeed00
+              type: data_router
+              location: "loc00"
+            - name: dfcFeed01
+              type: data_router
+              location: "loc00"
 
 Performance
 ^^^^^^^^^^^
diff --git a/docs/sections/services/dfc/release-notes.rst b/docs/sections/services/dfc/release-notes.rst
index a0277d8..0025b83 100644
--- a/docs/sections/services/dfc/release-notes.rst
+++ b/docs/sections/services/dfc/release-notes.rst
@@ -4,6 +4,12 @@
 Release Notes
 =============
 
+Version 1.2.1
+-------------
+
+The DFC is now generalized: it can handle any kind of files, not only PM files.
+
+
 Version 1.1.3
 -------------