DAR-809|810: Comments added to use namespaces when work will be done