diff --git a/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js
index ad1067a03..ac249d34c 100755
--- a/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js
@@ -206,7 +206,8 @@
                 } else if($scope.providerType === 'AZURE'){
                     bpCreateSer.getAzureLocations(blueprintCreation.newEnt.providers).then(function(data){
                         if(blueprintCreation.newEnt.providers){
-                            blueprintCreation.regionListingAzure = data.Locations.Location;
+                            blueprintCreation.regionListingAzure = data.locationList;
+                            blueprintCreation.instanceSizeListingAzure = data.instanceSizeList;
                             $scope.isRegionKeyPairLoading = false;
                         }
                     });
@@ -247,33 +248,27 @@
 
             blueprintCreation.listVpcs = function(){
                 $scope.isVPCLoading = true;
-                if($scope.providerType === 'AWS'){
-                    bpCreateSer.postVpcs(blueprintCreation.newEnt.providers,blueprintCreation.newEnt.region).then(function(data){
-                        if(blueprintCreation.newEnt.region){
-                            blueprintCreation.vpcListing = data.Vpcs;    
-                            $scope.isVPCLoading = false;
-                        }
-                    });    
-                } else if($scope.providerType === 'AZURE'){
-                    bpCreateSer.getAzureVPC(blueprintCreation.newEnt.providers).then(function(data){
-                        if(blueprintCreation.newEnt.region){
-                            var azureVpc = data.VirtualNetworkSites.VirtualNetworkSite;
-                            for(var i =0; i<azureVpc.length;i++){
-                                if(blueprintCreation.newEnt.region === azureVpc[i].Location){
-                                    blueprintCreation.vpcListing.push(azureVpc[i]);
-                                    $scope.isVPCLoading = false;        
-                                }
+                if(blueprintCreation.newEnt.region) {
+                    if ($scope.providerType === 'AWS') {
+                        bpCreateSer.postVpcs(blueprintCreation.newEnt.providers, blueprintCreation.newEnt.region).then(function (data) {
+                                blueprintCreation.vpcListing = data.Vpcs;
+                                $scope.isVPCLoading = false;
+                        });
+                    } else if ($scope.providerType === 'AZURE') {
+                        bpCreateSer.getAzureVPC(blueprintCreation.newEnt.providers, blueprintCreation.newEnt.region).then(function (data) {
+                                blueprintCreation.vpcListing = data.vpcList;
+                                blueprintCreation.subnetListing = data.subnetList;
+                                $scope.isVPCLoading = false;
+                        });
+                        var instanceSizeList = blueprintCreation.instanceSizeListingAzure;
+                        for (var i = 0; i < instanceSizeList.length; i++) {
+                            if (blueprintCreation.newEnt.region === Object.keys(instanceSizeList[i])[0]) {
+                                blueprintCreation.instanceType = instanceSizeList[i][blueprintCreation.newEnt.region];
+                                $scope.isInstanceTypeLoading = false;
                             }
                         }
-                    });
-                    var regionInstanceType = blueprintCreation.regionListingAzure;
-                    for(var i=0;i<regionInstanceType.length;i++){
-                        if(blueprintCreation.newEnt.region === regionInstanceType[i].Name){
-                            blueprintCreation.instanceType = regionInstanceType[i].ComputeCapabilities.VirtualMachinesRoleSizes.RoleSize;
-                            $scope.isInstanceTypeLoading = false;
-                        }
                     }
-                }
+                };
             };
 
             blueprintCreation.postSubnets = function() {
@@ -289,11 +284,11 @@
                             }    
                         });    
                     } else if($scope.providerType === 'AZURE'){
-                        var subnetsAzure = blueprintCreation.vpcListing;
-                        for(var i =0;i<subnetsAzure.length;i++){
-                            if(blueprintCreation.newEnt.vpcId === subnetsAzure[i].Name){
-                                blueprintCreation.subnetListingAzure = subnetsAzure[i].Subnets.Subnet;
-                            }  
+                        var subnetList = blueprintCreation.subnetListing;
+                        for(var i=0;i<subnetList.length;i++){
+                            if(blueprintCreation.newEnt.vpcId === Object.keys(subnetList[i])[0]){
+                                blueprintCreation.subnetListingAzure = subnetList[i][blueprintCreation.newEnt.vpcId];
+                            }
                         }
                     }
                 }else{
diff --git a/client/cat3/src/partials/sections/dashboard/design/services/blueprintCreateServices.js b/client/cat3/src/partials/sections/dashboard/design/services/blueprintCreateServices.js
index 531b95ea6..d09acea38 100755
--- a/client/cat3/src/partials/sections/dashboard/design/services/blueprintCreateServices.js
+++ b/client/cat3/src/partials/sections/dashboard/design/services/blueprintCreateServices.js
@@ -204,9 +204,9 @@
 				return genericServices.promiseGet(params);
 			};
 			//listing down the azure networks(VPC)
-			blueprintServices.getAzureVPC = function (azureProviderId) {
+			blueprintServices.getAzureVPC = function (azureProviderId,location) {
 				var params = {
-					url: '/azure/'+ azureProviderId +'/networks',
+					url: '/azure/'+ azureProviderId +'/networks?location='+location,
 					inlineLoader:true
 				};
 				return genericServices.promiseGet(params);
diff --git a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html
index b207b7a17..208798749 100755
--- a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html
+++ b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html
@@ -50,7 +50,7 @@
                              Provider Parameters
                            </accordion-heading>
                            <div class="col-lg-4 col-md-4">
-                              <label for="instanceOS">Choose Operating System:<span class="red">&nbsp;*</span>
+                              <label for="instanceOS">Select Operating System:<span class="red">&nbsp;*</span>
                                  <span ng-show="newBlueprintForm.osListing.$touched && newBlueprintForm.osListing.$invalid" class="inputValidationMsg">Required</span>
                                  <loading size="small" name="isOSLoading" type="inline"></loading>
                               </label>
@@ -63,7 +63,7 @@
                               </select>
                            </div>
                            <div class="col-lg-4 col-md-4">
-                              <label for="providerId">Choose Provider:<span class="red">&nbsp;*</span>
+                              <label for="providerId">Select Provider:<span class="red">&nbsp;*</span>
                                  <span ng-show="newBlueprintForm.providerId.$touched && newBlueprintForm.providerId.$invalid" class="inputValidationMsg">Required</span>
                                  <loading size="small" name="isOSLoading" type="inline"></loading>
                               </label>
@@ -74,7 +74,7 @@
                               </select>
                            </div>
                            <div class="col-lg-4 col-md-4">
-                              <label for="imageId">Choose Available Images:<span class="red">&nbsp;*</span>
+                              <label for="imageId">Select Available Images:<span class="red">&nbsp;*</span>
                                  <span ng-show="newBlueprintForm.imageId.$touched && newBlueprintForm.imageId.$invalid" class="inputValidationMsg">Required</span>
                                  <loading size="small" name="isImageLoading" type="inline"></loading>
                               </label>
@@ -91,18 +91,18 @@
                               <input ng-model="bpCreate.newEnt.blueprintSecurityGroupPort" name="blueprintSecurityGroupPortInput" class="form-control" type="text" autofocus="autofocus" required placeholder="Enter ports separated by comma">
                            </div>
                            <div class="col-lg-4 col-md-4 margintop15" ng-if="providerType === 'AWS'  || providerType === 'AZURE'">
-                              <label for="region">Choose Region:<span class="red">&nbsp;*</span>
+                              <label for="region">Select Region:<span class="red">&nbsp;*</span>
                                  <span ng-show="newBlueprintForm.region.$touched && newBlueprintForm.region.$invalid" class="inputValidationMsg">Required</span>
                                  <loading size="small" name="isRegionKeyPairLoading" type="inline"></loading>
                               </label>
                               <select ng-model="bpCreate.newEnt.region" name="region" class="chooseSecurity width-100 form-control" ng-change="bpCreate.listVpcs();" required>
                                  <option value="">Select Region</option>
                                  <option ng-if="providerType === 'AWS'" value="{{bpCreate.regionListing.region}}">{{bpCreate.regionListing.region_name}} | {{bpCreate.regionListing.region}}</option>
-                                 <option ng-repeat="location in bpCreate.regionListingAzure" ng-if="providerType === 'AZURE'" value="{{location.Name}}">{{location.Name}}</option>
+                                 <option ng-repeat="location in bpCreate.regionListingAzure" ng-if="providerType === 'AZURE'" value="{{location}}">{{location}}</option>
                               </select>
                            </div>
                            <div class="col-lg-4 col-md-4 margintop15" ng-if="providerType === 'OPENSTACK'">
-                              <label for="flavour">Choose Flavour:<span class="red">&nbsp;*</span>
+                              <label for="flavour">Select Flavour:<span class="red">&nbsp;*</span>
                                  <span ng-show="newBlueprintForm.flavour.$touched && newBlueprintForm.flavour.$invalid" class="inputValidationMsg">Required</span>
                                  <loading size="small" name="isRegionKeyPairLoading" type="inline"></loading>
                               </label>
@@ -112,7 +112,7 @@
                               </select>
                            </div>
                            <div class="col-lg-4 col-md-4 margintop15" ng-if="providerType === 'OPENSTACK'">
-                              <label for="network">Choose Network:<span class="red">&nbsp;*</span>
+                              <label for="network">Select Network:<span class="red">&nbsp;*</span>
                                  <span ng-show="newBlueprintForm.network.$touched && newBlueprintForm.network.$invalid" class="inputValidationMsg">Required</span>
                                  <loading size="small" name="isRegionKeyPairLoading" type="inline"></loading>
                               </label>
@@ -122,18 +122,18 @@
                               </select>
                            </div>
                            <div class="col-lg-4 col-md-4 margintop15" ng-if="providerType === 'AWS'  || providerType === 'AZURE'">
-                              <label for="vpcId">Choose VPC:<span class="red">&nbsp;*</span>
+                              <label for="vpcId">Select VPC:<span class="red">&nbsp;*</span>
                                  <span ng-show="newBlueprintForm.vpcId.$touched && newBlueprintForm.vpcId.$invalid" class="inputValidationMsg">Required</span>
                                  <loading size="small" name="isVPCLoading" type="inline"></loading>
                               </label>
                               <select ng-model="bpCreate.newEnt.vpcId" name="vpcId" class="chooseSelect chooseImage width-100 form-control" ng-change="bpCreate.postSubnets();" required>
                                  <option value="">Select VPC</option>
                                  <option ng-if="providerType === 'AWS'" ng-repeat="vpcDetails in bpCreate.vpcListing" value="{{vpcDetails.VpcId}}">{{vpcDetails.VpcId}} ({{vpcDetails.CidrBlock}}) {{vpcDetails.Tags[0].Value}}</option>
-                                 <option ng-if="providerType === 'AZURE'" ng-repeat="vpcDetailsAzure in bpCreate.vpcListing" value="{{vpcDetailsAzure.Name}}">{{vpcDetailsAzure.Name}}</option>
+                                 <option ng-if="providerType === 'AZURE'" ng-repeat="vpcDetailsAzure in bpCreate.vpcListing" value="{{vpcDetailsAzure}}">{{vpcDetailsAzure}}</option>
                               </select>
                            </div>
                            <div class="col-lg-4 col-md-4 margintop15" ng-if="providerType !=='VMWARE'">
-                              <label for="subnetId">Choose Subnet:<span class="red">&nbsp;*</span>
+                              <label for="subnetId">Select Subnet:<span class="red">&nbsp;*</span>
                                  <span ng-show="newBlueprintForm.subnetId.$touched && newBlueprintForm.subnetId.$invalid" class="inputValidationMsg">Required</span>
                                  <loading size="small" name="isSubnetLoading" type="inline"></loading>
                               </label>
@@ -144,7 +144,7 @@
                               </select>
                            </div>
                            <div class="col-lg-4 col-md-4 margintop15" ng-if="providerType === 'AWS'">
-                              <label for="keypairId">Choose KeyPair:<span class="red">&nbsp;*</span>
+                              <label for="keypairId">Select KeyPair:<span class="red">&nbsp;*</span>
                                  <span ng-show="newBlueprintForm.keypairId.$touched && newBlueprintForm.keypairId.$invalid" class="inputValidationMsg">Required</span>
                                  <loading size="small" name="isRegionKeyPairLoading" type="inline"></loading>
                               </label>
@@ -196,7 +196,7 @@
                               </div>
                             </div>
                            <div class="col-lg-4 col-md-4 margintop15" ng-if="providerType === 'VMWARE'">
-                              <label for="dataStore">Choose Data Store:<span class="red">&nbsp;*</span>
+                              <label for="dataStore">Select Data Store:<span class="red">&nbsp;*</span>
                                  <span ng-show="newBlueprintForm.dataStore.$touched && newBlueprintForm.dataStore.$invalid" class="inputValidationMsg">Required</span>
                                  <loading size="small" name="isRegionKeyPairLoading" type="inline"></loading>
                               </label>
@@ -220,7 +220,7 @@
                               <input ng-model="bpCreate.newEnt.blueprintName" name="blueprintNameInput" class="form-control" type="text" autofocus="autofocus" required>
                            </div>
                            <div class="col-lg-4 col-md-4">
-                              <label for="orgnameSelect">Choose Organization <span class="red">&nbsp;*</span>
+                              <label for="orgnameSelect">Select Organization <span class="red">&nbsp;*</span>
                                  <span ng-show="newBlueprintForm.orgnameSelect.$touched && newBlueprintForm.orgnameSelect.$invalid" class="inputValidationMsg">Required</span>
                               </label>
                               <select ng-model="bpCreate.newEnt.orgList" name="orgnameSelect" class="chooseOrgselect2 width-100 form-control" ng-change="bpCreate.getBG();" required>
@@ -230,7 +230,7 @@
                            </div>
 
                            <div class="col-lg-4 col-md-4">
-                              <label for="bgListInput">Choose Business Group <span class="red">&nbsp;*</span>
+                              <label for="bgListInput">Select Business Group <span class="red">&nbsp;*</span>
                                  <span ng-show="newBlueprintForm.bgListInput.$touched && newBlueprintForm.bgListInput.$invalid" class="inputValidationMsg">Required</span>
                               </label>
                               <select ng-model="bpCreate.newEnt.bgList" name="bgListInput" class="chooseBG width-100 form-control" ng-change="bpCreate.getProject();" required>
@@ -239,7 +239,7 @@
                               </select>
                            </div>
                            <div class="col-lg-4 col-md-4 margintop15">
-                              <label for="projectListInput">Choose Project <span class="red">&nbsp;*</span>
+                              <label for="projectListInput">Select Project <span class="red">&nbsp;*</span>
                                  <span ng-show="newBlueprintForm.projectList.$touched && newBlueprintForm.projectList.$invalid" class="inputValidationMsg">Required</span>
                               </label>
                               <select ng-model="bpCreate.newEnt.projectList" name="projectListInput" class="chooseProject width-100 form-control" ng-change="bpCreate.enableAppDeploy();" required>
@@ -328,7 +328,7 @@
                               <label for="">Repository Server:<span class="redSpan">*</span>
                               </label>
                               <select ng-model="bpCreate.newEnt.nexusDockerServer" name="" class=" width-100 form-control" ng-change="bpCreate.getRepository();">
-                                 <option value="">Choose Server</option>
+                                 <option value="">Select Server</option>
                                  <option ng-repeat="serverOption in bpCreate.serverRepos" value="{{bpCreate.serverRepos.indexOf(serverOption)}}">{{(serverOption.nexusservername) ? serverOption.nexusservername : serverOption.dockerreponame}}</option>
                               </select>
                            </div>
@@ -340,7 +340,7 @@
                                  </label>
                                  <div class="input-groups">
                                     <select name="repositories" class="form-control" ng-model="bpCreate.newEnt.repositoryIMG" ng-change="bpCreate.changeRepository();" required>
-                                       <option value="">Choose Repositories</option>
+                                       <option value="">Select Repositories</option>
                                        <option ng-repeat="(key,value) in bpCreate.repositoryOptions" value="{{value}}">{{value}}</option>
                                     </select>
                                  </div>
@@ -350,7 +350,7 @@
                                     <loading size="small" name="isLoadingDocTag" type="inline"></loading>
                                  </label>
                                  <select class="form-control" ng-model="bpCreate.newEnt.tag"  required>
-                                    <option value="">Choose Tag</option>
+                                    <option value="">Select Tag</option>
                                     <option ng-repeat="tagOption in bpCreate.tagOptions" value="{{tagOption.name}}">{{tagOption.name}}</option>
                                  </select>
                               </div>
@@ -378,7 +378,7 @@
                                  </label>
                                  <div class="input-groups">
                                     <select name="repositoryInd" class="form-control" ng-model="bpCreate.newEnt.repositoryInd" ng-change="bpCreate.changeRepository();" required>
-                                       <option value="">Choose Repositories</option>
+                                       <option value="">Select Repositories</option>
                                        <option ng-repeat="repository in bpCreate.repositoryOptions" value="{{bpCreate.repositoryOptions.indexOf(repository)}}">{{repository.name}}</option>
                                     </select>
                                  </div>
@@ -389,7 +389,7 @@
                                  </label>
                                  <div class="input-groups">
                                     <select class="form-control" name="groupId" ng-model="bpCreate.newEnt.groupId"  ng-change="bpCreate.getArtifacts()" required>
-                                       <option value="">Choose Group ID</option>
+                                       <option value="">Select Group ID</option>
                                        <option ng-repeat="(key , val) in bpCreate.groupOptions" value="{{val}}">{{val}}</option>
                                     </select>
                                  </div>
@@ -400,7 +400,7 @@
                                  </label>
                                  <div class="input-groups">
                                     <select class="form-control" name="artifactInd" ng-model="bpCreate.newEnt.artifact" ng-change="bpCreate.getVersions();" required>
-                                       <option value="">Choose Artifacts</option>
+                                       <option value="">Select Artifacts</option>
                                        <option ng-repeat="(key , artifact) in  bpCreate.artifactsOptions" value="{{artifact}}">{{artifact}}</option>
                                     </select>
                                  </div>
@@ -411,7 +411,7 @@
                                  </label>
                                  <div class="input-groups">
                                     <select class="form-control" name="version" ng-model="bpCreate.newEnt.version" required>
-                                       <option value="">Choose Versions</option>
+                                       <option value="">Select Versions</option>
                                        <option ng-repeat="(key , values) in bpCreate.versionsOptions" value="{{values}}">{{values}}</option>
                                     </select>
                                  </div>
@@ -454,7 +454,7 @@
                               Configure Stack Parameters
                            </accordion-heading>
                            <div class="col-lg-6 col-md-6">
-                              <label for="region">Choose Region:<span class="red">&nbsp;*</span>
+                              <label for="region">Select Region:<span class="red">&nbsp;*</span>
                                  <span ng-show="newBlueprintForm.region.$touched && newBlueprintForm.region.$invalid" class="inputValidationMsg">Required</span>
                                  <loading size="small" name="isRegionKeyPairLoading" type="inline"></loading>
                               </label>
@@ -464,7 +464,7 @@
                               </select>
                            </div>
                            <div class="col-lg-6 col-md-6">
-                              <label for="orgnameSelect">Choose Provider <span class="red">&nbsp;*</span>
+                              <label for="orgnameSelect">Select Provider <span class="red">&nbsp;*</span>
                                  <span ng-show="newBlueprintForm.providerId.$touched && newBlueprintForm.providerId.$invalid" class="inputValidationMsg">Required</span>
                               </label>
                               <select ng-model="bpCreate.newEnt.providers" ng-change="bpCreate.getProviderImage();" name="providerId" class="chooseOSProvider width-100 form-control" required>
@@ -516,7 +516,7 @@
                               Configure Template Parameters
                            </accordion-heading>
                            <div class="col-lg-6 col-md-6">
-                              <label for="orgnameSelect">Choose Provider <span class="red">&nbsp;*</span>
+                              <label for="orgnameSelect">Select Provider <span class="red">&nbsp;*</span>
                                  <span ng-show="newBlueprintForm.providerId.$touched && newBlueprintForm.providerId.$invalid" class="inputValidationMsg">Required</span>
                               </label>
                               <select ng-model="bpCreate.newEnt.providers" name="providerId" class="chooseOSProvider width-100 form-control" ng-change="bpCreate.getResourceGroups();" required>
@@ -525,7 +525,7 @@
                               </select>
                            </div>
                            <div class="col-lg-6 col-md-6">
-                              <label for="resourceGroup">Choose Resource Group:<span class="red">&nbsp;*</span>
+                              <label for="resourceGroup">Select Resource Group:<span class="red">&nbsp;*</span>
                                  <span ng-show="newBlueprintForm.resourceGroup.$touched && newBlueprintForm.resourceGroup.$invalid" class="inputValidationMsg">Required</span>
                                  <loading size="small" name="isResourceGroupLoading" type="inline"></loading>
                               </label>
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintInfoCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintInfoCtrl.js
index 64a327957..2f3a9da24 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintInfoCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintInfoCtrl.js
@@ -28,7 +28,7 @@
 				break;
 			}
 			
-			workzoneServices.blueprintInfo(items.selectedVersionBpId).then(function(response) {
+			workzoneServices.blueprintInfo(items._id).then(function(response) {
 				$scope.blueprintInfo = response.data;
 			},
 			function(error) {
diff --git a/client/htmls/private/ajax/Settings/providerSync.html b/client/htmls/private/ajax/Settings/providerSync.html
index 4644195ef..567fa7df5 100644
--- a/client/htmls/private/ajax/Settings/providerSync.html
+++ b/client/htmls/private/ajax/Settings/providerSync.html
@@ -871,7 +871,7 @@ <h4 class="modal-title">Importing Instances</h4>
             "destroy":true,
             "ajax": '/resources?filterBy=providerId:'+ urlproviderId +'+resourceType:RDS+category:assigned',
             "columns": [
-                {"data": "resourceDetails.dbName",  "orderable" : true},
+                {"data": "resourceDetails.dbInstanceIdentifier",  "orderable" : true},
                 {"data": "resourceDetails.dbEngine","orderable" : true  },
                 {"data": "resourceDetails.dbInstanceStatus","orderable" : true  },
                 {"data": "masterDetails.orgName","orderable" : true,
@@ -1825,7 +1825,7 @@ <h4 class="modal-title">Importing Instances</h4>
                     $( row ).attr({"resourceId" : data._id,"resourceType":data.resourceType,"bgTagsMapName" : envProjectMappingObject.bgName, "projectTagsMapName" : envProjectMappingObject.project, "envTagsMapName" : envProjectMappingObject.environment})
                 },
                 "columns": [
-                    {"data": "resourceDetails.dbName",  "orderable" : true},
+                    {"data": "resourceDetails.dbInstanceIdentifier",  "orderable" : true},
                     {"data": "resourceDetails.dbEngine","orderable" : true  },
                     {"data": "resourceDetails.region","orderable" : false  },
                     {"data": "" ,"orderable" : false,
@@ -1860,7 +1860,7 @@ <h4 class="modal-title">Importing Instances</h4>
                     },
                     {"data": "","orderable" : false,
                         "render":function(data,type,full,meta){
-                            if(full.resourceDetails.dbName){
+                            if(full.resourceDetails.dbInstanceIdentifier){
                                 return '<input class="nodeCheckBox" type="checkbox" val=""/>';
                             }else{
                                 return '';
diff --git a/client/htmls/public/js/awsRDSDashboard.js b/client/htmls/public/js/awsRDSDashboard.js
index 9532455d2..235e553d9 100644
--- a/client/htmls/public/js/awsRDSDashboard.js
+++ b/client/htmls/public/js/awsRDSDashboard.js
@@ -153,7 +153,7 @@ $(document).ready(function() {
         "destroy":true,
         "ajax": '/resources?filterBy=providerId:'+ providerId +'+resourceType:RDS+category:assigned',
         "columns": [
-            {"data": "resourceDetails.dbName",  "orderable" : true},
+            {"data": "resourceDetails.dbInstanceIdentifier",  "orderable" : true},
             {"data": "masterDetails.orgName","orderable" : false,
                 "render": function (data) {
                     if(data !== null){
@@ -210,7 +210,7 @@ $(document).ready(function() {
             "destroy":true,
             "ajax": '/resources?filterBy=resourceType:RDS+category:assigned',
             "columns": [
-                {"data": "resourceDetails.dbName",  "orderable" : true},
+                {"data": "resourceDetails.dbInstanceIdentifier",  "orderable" : true},
                 {"data": "masterDetails.orgName","orderable" : false,
                     "render": function (data) {
                         if(data !== null){
@@ -281,7 +281,7 @@ $(document).ready(function() {
             $( row ).attr({"resourceId" : data._id,"resourceType":data.resourceType})
         },
         "columns": [
-            {"data": "resourceDetails.dbName",  "orderable" : true},
+            {"data": "resourceDetails.dbInstanceIdentifier",  "orderable" : true},
             {"data": "resourceDetails.dbEngine","orderable" : true  },
             {"data": "resourceDetails.dbInstanceStatus","orderable" : true  },
             {"data": "resourceDetails.region","orderable" : false  },
@@ -305,7 +305,7 @@ $(document).ready(function() {
                 $( row ).attr({"resourceId" : data._id,"resourceType":data.resourceType})
             },
             "columns": [
-                {"data": "resourceDetails.dbName",  "orderable" : true},
+                {"data": "resourceDetails.dbInstanceIdentifier",  "orderable" : true},
                 {"data": "resourceDetails.dbEngine","orderable" : true  },
                 {"data": "resourceDetails.dbInstanceStatus","orderable" : true  },
                 {"data": "resourceDetails.region","orderable" : false  },
diff --git a/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js b/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js
index 2e7ffda58..beda12529 100644
--- a/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js
+++ b/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js
@@ -286,7 +286,7 @@ function deleteRDSResourceData(rdsInfo,providerId, callback) {
                     var count = 0;
                     for (var i = 0; i < rdsData.length; i++) {
                         (function (rds) {
-                            if (dbNames.indexOf(rds.resourceDetails.dbName) === -1) {
+                            if (dbNames.indexOf(rds.resourceDetails.dbInstanceIdentifier) === -1) {
                                 resourceModel.deleteResourcesById(rds._id, function (err, data) {
                                     if (err) {
                                         next(err);
@@ -443,7 +443,7 @@ function bucketNameList(s3Info,callback){
 function rdsDBNameList(rdsInfo,callback){
     var dbNames=[];
     for(var i = 0; i < rdsInfo.length; i++){
-        dbNames.push(rdsInfo[i].resourceDetails.dbName);
+        dbNames.push(rdsInfo[i].resourceDetails.dbInstanceIdentifier);
         if(dbNames.length === rdsInfo.length){
             callback(null,dbNames);
         }
diff --git a/server/app/lib/rds.js b/server/app/lib/rds.js
index fe138cacb..5c0a77b22 100644
--- a/server/app/lib/rds.js
+++ b/server/app/lib/rds.js
@@ -45,8 +45,10 @@ var RDS = function(awsSettings) {
             if(err){
                 logger.error(err);
                 callback(err,null);
+                return;
             } else{
                 callback(null,data.DBInstances);
+                return;
             }
         });
     };
diff --git a/server/app/model/resources/rds-resource.js b/server/app/model/resources/rds-resource.js
index 2a91d6afb..db855086d 100644
--- a/server/app/model/resources/rds-resource.js
+++ b/server/app/model/resources/rds-resource.js
@@ -24,6 +24,11 @@ var Schema = mongoose.Schema;
 
 var RDSResourcesSchema = new BaseResourcesSchema({
     resourceDetails: {
+        dbInstanceIdentifier:{
+            type: String,
+            required: true,
+            trim: true
+        },
         dbName: {
             type: String,
             required: true,
diff --git a/server/app/routes/v1.0/routes_azure.js b/server/app/routes/v1.0/routes_azure.js
index ea3cd9c38..e7273db12 100755
--- a/server/app/routes/v1.0/routes_azure.js
+++ b/server/app/routes/v1.0/routes_azure.js
@@ -1,18 +1,18 @@
 /*
-Copyright [2016] [Relevance Lab]
+ Copyright [2016] [Relevance Lab]
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
 
 // This file act as a Controller which contains azure related all end points.
 
@@ -25,169 +25,197 @@ var fs = require('fs');
 var appConfig = require('_pr/config');
 var Cryptography = require('_pr/lib/utils/cryptography');
 var uuid = require('node-uuid');
+var async = require('async');
 
 module.exports.setRoutes = function(app, verificationFunc) {
-
     app.all('/azure/*', verificationFunc);
-
     app.get('/azure/:id/networks', function(req, res) {
-
-        logger.debug('Inside azure get networks');
-        logger.debug('Provider id:', req.params.id);
-
-        azureProvider.getAzureCloudProviderById(req.params.id, function(err, providerdata) {
-            if (err) {
-                logger.error('getAzureCloudProviderById ' + err);
-                return;
-            }
-
-            logger.debug('providerdata:', providerdata);
-            providerdata = JSON.parse(providerdata);
-
-            var settings = appConfig;
-            var pemFile = settings.instancePemFilesDir + providerdata._id + providerdata.pemFileName;
-            var keyFile = settings.instancePemFilesDir + providerdata._id + providerdata.keyFileName;
-
-
-            var cryptoConfig = appConfig.cryptoSettings;
-            var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password);
-
-            var uniqueVal = uuid.v4().split('-')[0];
-
-            var decryptedPemFile = pemFile + '_' + uniqueVal + '_decypted';
-            var decryptedKeyFile = keyFile + '_' + uniqueVal + '_decypted';
-
-            cryptography.decryptFile(pemFile, cryptoConfig.decryptionEncoding, decryptedPemFile, cryptoConfig.encryptionEncoding, function(err) {
-                if (err) {
-                    logger.error('Pem file decryption failed>> ', err);
-                    return;
+        if(req.params.id === null || req.params.id === 'null'){
+            logger.debug("Provider Id is pass as Null in params");
+            res.status(500).send(req.params.id);
+            return;
+        }
+        var location = req.query.location;
+        async.waterfall([
+            function(next){
+                azureProvider.getAzureCloudProviderById(req.params.id,next);
+            },
+            function(azureProviderDetails,next){
+                if(azureProviderDetails !== null) {
+                    azureProviderDetails = JSON.parse(azureProviderDetails);
+                    var pemFile = appConfig.instancePemFilesDir + azureProviderDetails._id + azureProviderDetails.pemFileName;
+                    var keyFile = appConfig.instancePemFilesDir + azureProviderDetails._id + azureProviderDetails.keyFileName;
+                    var cryptConfig = appConfig.cryptoSettings;
+                    var cryptography = new Cryptography(cryptConfig.algorithm, cryptConfig.password);
+                    var uniqueVal = uuid.v4().split('-')[0];
+                    var decryptedPemFile = pemFile + '_' + uniqueVal + '_decypted';
+                    var decryptedKeyFile = keyFile + '_' + uniqueVal + '_decypted';
+                    cryptography.decryptFile(pemFile, cryptConfig.decryptionEncoding, decryptedPemFile, cryptConfig.encryptionEncoding, function (err) {
+                        if (err) {
+                            next(err);
+                        }
+                        cryptography.decryptFile(keyFile, cryptConfig.decryptionEncoding, decryptedKeyFile, cryptConfig.encryptionEncoding, function (err) {
+                            if (err) {
+                                next(err);
+                            }
+                            var options = {
+                                subscriptionId: azureProviderDetails.subscriptionId,
+                                certLocation: decryptedPemFile,
+                                keyLocation: decryptedKeyFile
+                            };
+                            next(null, options);
+                        });
+                    });
+                }else{
+                    next('No Azure Provider is configure',null);
                 }
-
-                cryptography.decryptFile(keyFile, cryptoConfig.decryptionEncoding, decryptedKeyFile, cryptoConfig.encryptionEncoding, function(err) {
+            },
+            function(azureOptions,next) {
+                var azureCloud = new AzureCloud(azureOptions);
+                azureCloud.getNetworks(function (err, networks) {
                     if (err) {
-                        logger.error('key file decryption failed>> ', err);
-                        return;
+                        next(err);
                     }
-
-                    var options = {
-                        subscriptionId: providerdata.subscriptionId,
-                        certLocation: decryptedPemFile,
-                        keyLocation: decryptedKeyFile
-                    };
-
-                    var azureCloud = new AzureCloud(options);
-
-                    azureCloud.getNetworks(function(err, networks) {
-                        if (err) {
-                            logger.error('azurecloud networks fetch error', err);
-                            res.status(500).send(err);
-                            return;
-                        }
-                        var json = xml2json.toJson(networks);
-                        res.send(json);
-                        logger.debug('Exit azure get networks:' + JSON.stringify(networks));
-
-                        fs.unlink(decryptedPemFile, function(err) {
+                    var netWorkJsonObj = JSON.parse(xml2json.toJson(networks));
+                    var vpcList = [], subnetList = [], count = 0;
+                    for (var i = 0; i < netWorkJsonObj.VirtualNetworkSites.VirtualNetworkSite.length; i++) {
+                        (function (VirtualNetworkSite) {
+                            if (VirtualNetworkSite.Location === location) {
+                                var networkName = VirtualNetworkSite.Name
+                                vpcList.push(networkName);
+                                var subNets = {};
+                                if (VirtualNetworkSite.Subnets.Subnet.length > 0) {
+                                    subNets[networkName] = VirtualNetworkSite.Subnets.Subnet;
+                                } else {
+                                    subNets[networkName] = [VirtualNetworkSite.Subnets.Subnet];
+                                }
+                                subnetList.push(subNets);
+                                count++;
+                            } else {
+                                count++;
+                            }
+                        })(netWorkJsonObj.VirtualNetworkSites.VirtualNetworkSite[i]);
+                    }
+                    if (count === netWorkJsonObj.VirtualNetworkSites.VirtualNetworkSite.length) {
+                        fs.unlink(azureOptions.certLocation, function(err) {
                             logger.debug("Deleting decryptedPemFile..");
                             if (err) {
                                 logger.error("Error in deleting decryptedPemFile..");
                             }
-
-                            fs.unlink(decryptedKeyFile, function(err) {
+                            fs.unlink(azureOptions.keyLocation, function(err) {
                                 logger.debug("Deleting decryptedKeyFile ..");
                                 if (err) {
                                     logger.error("Error in deleting decryptedKeyFile..");
                                 }
+                                var results = {
+                                    vpcList: vpcList,
+                                    subnetList: subnetList
+                                }
+                                next(null,results);
                             });
                         });
-                    });
+                    }
                 });
-            });
+            }
 
+        ],function(err,results){
+            if(err){
+                logger.error(err);
+                res.status(500).send(err);
+                return;
+            }else{
+                res.status(200).send(results);
+                return;
+            }
         });
     });
 
     app.get('/azure/:id/locations', function(req, res) {
-
-        logger.debug('Inside azure get locations');
-        logger.debug('Provider Id:', req.params.id);
         if(req.params.id === null || req.params.id === 'null'){
             logger.debug("Provider Id is pass as Null in params");
             res.status(500).send(req.params.id);
             return;
         }
-        azureProvider.getAzureCloudProviderById(req.params.id, function(err, providerdata) {
-            if (err) {
-                logger.error('getAzureCloudProviderById ' + err);
-                return;
-            }
-
-            logger.debug('providerdata:', providerdata);
-            providerdata = JSON.parse(providerdata);
-
-            var settings = appConfig;
-            var pemFile = settings.instancePemFilesDir + providerdata._id + providerdata.pemFileName;
-            var keyFile = settings.instancePemFilesDir + providerdata._id + providerdata.keyFileName;
-
-
-            var cryptoConfig = appConfig.cryptoSettings;
-            var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password);
-
-            var uniqueVal = uuid.v4().split('-')[0];
-
-            var decryptedPemFile = pemFile + '_' + uniqueVal + '_decypted';
-            var decryptedKeyFile = keyFile + '_' + uniqueVal + '_decypted';
-
-            cryptography.decryptFile(pemFile, cryptoConfig.decryptionEncoding, decryptedPemFile, cryptoConfig.encryptionEncoding, function(err) {
-                if (err) {
-                    logger.error('Pem file decryption failed>> ', err);
-                    return;
+        async.waterfall([
+            function(next){
+                azureProvider.getAzureCloudProviderById(req.params.id,next);
+            },
+            function(azureProviderDetails,next){
+                if(azureProviderDetails !== null) {
+                    azureProviderDetails = JSON.parse(azureProviderDetails);
+                    var pemFile = appConfig.instancePemFilesDir + azureProviderDetails._id + azureProviderDetails.pemFileName;
+                    var keyFile = appConfig.instancePemFilesDir + azureProviderDetails._id + azureProviderDetails.keyFileName;
+                    var cryptConfig = appConfig.cryptoSettings;
+                    var cryptography = new Cryptography(cryptConfig.algorithm, cryptConfig.password);
+                    var uniqueVal = uuid.v4().split('-')[0];
+                    var decryptedPemFile = pemFile + '_' + uniqueVal + '_decypted';
+                    var decryptedKeyFile = keyFile + '_' + uniqueVal + '_decypted';
+                    cryptography.decryptFile(pemFile, cryptConfig.decryptionEncoding, decryptedPemFile, cryptConfig.encryptionEncoding, function (err) {
+                        if (err) {
+                            next(err);
+                        }
+                        cryptography.decryptFile(keyFile, cryptConfig.decryptionEncoding, decryptedKeyFile, cryptConfig.encryptionEncoding, function (err) {
+                            if (err) {
+                                next(err);
+                            }
+                            var options = {
+                                subscriptionId: azureProviderDetails.subscriptionId,
+                                certLocation: decryptedPemFile,
+                                keyLocation: decryptedKeyFile
+                            };
+                            next(null, options);
+                        });
+                    });
+                }else{
+                    next('No Azure Provider is configure',null);
                 }
-
-                cryptography.decryptFile(keyFile, cryptoConfig.decryptionEncoding, decryptedKeyFile, cryptoConfig.encryptionEncoding, function(err) {
+            },
+            function(azureOptions,next) {
+                var azureCloud = new AzureCloud(azureOptions);
+                azureCloud.getLocations(function(err, locations) {
                     if (err) {
-                        logger.error('key file decryption failed>> ', err);
-                        return;
+                        next(err);
                     }
-
-                    var options = {
-                        subscriptionId: providerdata.subscriptionId,
-                        certLocation: decryptedPemFile,
-                        keyLocation: decryptedKeyFile
-                    };
-
-                    var azureCloud = new AzureCloud(options);
-
-                    azureCloud.getLocations(function(err, locations) {
-                        if (err) {
-                            logger.error('azurecloud locations fetch error', err);
-                            res.status(500).send(err);
-                            return;
-                        }
-                        var json = xml2json.toJson(locations);
-                        res.send(json);
-                        logger.debug('Exit azure get locations:' + JSON.stringify(locations));
-
-                        fs.unlink(decryptedPemFile, function(err) {
-                            logger.debug("Deleting decryptedPemFile..");
+                    var locationObj = JSON.parse(xml2json.toJson(locations));
+                    var locationList =[],instanceSizeList =[],count = 0;
+                    for(var i = 0; i < locationObj.Locations.Location.length; i++){
+                        (function(location){
+                            locationList.push(location.Name);
+                            var instanceSize = {};
+                            instanceSize[location.Name] =location.ComputeCapabilities.VirtualMachinesRoleSizes.RoleSize;
+                            instanceSizeList.push(instanceSize);
+                            count++;
+                        })(locationObj.Locations.Location[i]);
+                    }
+                    if(count === locationObj.Locations.Location.length){
+                        fs.unlink(azureOptions.certLocation, function(err) {
                             if (err) {
                                 logger.error("Error in deleting decryptedPemFile..");
                             }
-
-                            fs.unlink(decryptedKeyFile, function(err) {
-                                logger.debug("Deleting decryptedKeyFile ..");
+                            fs.unlink(azureOptions.keyLocation, function(err) {
                                 if (err) {
                                     logger.error("Error in deleting decryptedKeyFile..");
                                 }
+                                var results = {
+                                    locationList:locationList,
+                                    instanceSizeList:instanceSizeList
+                                }
+                                next(null,results);
                             });
                         });
-                    });
-
+                    }
                 });
+            }
 
-            });
-
+        ],function(err,results){
+            if(err){
+                logger.error(err);
+                res.status(500).send(err);
+                return;
+            }else{
+                res.status(200).send(results);
+                return;
+            }
         });
     });
-
-}
\ No newline at end of file
+}
diff --git a/server/app/routes/v1.0/routes_d4dMasters.js b/server/app/routes/v1.0/routes_d4dMasters.js
index b7ad3fdeb..05963b56d 100755
--- a/server/app/routes/v1.0/routes_d4dMasters.js
+++ b/server/app/routes/v1.0/routes_d4dMasters.js
@@ -2541,33 +2541,33 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                                                 templatetypename = "Docker";
                                                                 designtemplateicon_filename = "Docker.png";
                                                                 templatetype = "docker";
-                                                                providerType = []
+                                                                providerType=['aws','azure','openstack','vmware'];
                                                             } else if (x1 === 1) {
                                                                 templatetypename = "OSImage";
                                                                 designtemplateicon_filename = "Desktop Provisining.png";
                                                                 templatetype = "ami";
-                                                                providerType=['aws','azure','openstack','vmware']
+                                                                providerType=['aws','azure','openstack','vmware'];
                                                             } else if (x1 === 2) {
                                                                 templatetypename = "SoftwareStack";
                                                                 designtemplateicon_filename = "Appfactory.png";
                                                                 templatetype = "chef";
-                                                                providerType=['aws','azure','openstack','vmware']
+                                                                providerType=['aws','azure','openstack','vmware'];
                                                             } else if (x1 === 3) {
                                                                 templatetypename = "CloudFormation";
                                                                 designtemplateicon_filename = "CloudFormation.png";
                                                                 templatetype = "cft";
-                                                                providerType=['aws']
+                                                                providerType=['aws'];
 
                                                             } else if (x1 === 4) {
                                                                 templatetypename = "ARMTemplate";
                                                                 designtemplateicon_filename = "CloudFormation.png";
                                                                 templatetype = "arm";
-                                                                providerType=['azure']
+                                                                providerType=['azure'];
                                                             } else {
                                                                 templatetypename = "Composite";
                                                                 designtemplateicon_filename = "composite.png";
                                                                 templatetype = "composite";
-                                                                providerType=['aws']
+                                                                providerType=['aws'];
                                                             }
 
                                                             var templateTypeData = {
diff --git a/server/app/services/resourceService.js b/server/app/services/resourceService.js
index 7feddace3..30d45b904 100644
--- a/server/app/services/resourceService.js
+++ b/server/app/services/resourceService.js
@@ -505,58 +505,58 @@ function getRDSDBInstanceMetrics(provider, dbInstances, startTime, endTime, peri
             cw = new CW(amazonConfig);
             async.parallel({
                     CPUUtilization: function (callback) {
-                        cw.getUsageMetrics('CPUUtilization','Percent','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbName}],startTime, endTime, period, callback);
+                        cw.getUsageMetrics('CPUUtilization','Percent','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbInstanceIdentifier}],startTime, endTime, period, callback);
                     },
                     BinLogDiskUsage: function (callback) {
-                        cw.getUsageMetrics('BinLogDiskUsage','Bytes','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbName}],startTime, endTime, period, callback);
+                        cw.getUsageMetrics('BinLogDiskUsage','Bytes','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbInstanceIdentifier}],startTime, endTime, period, callback);
                     },
                     CPUCreditUsage: function (callback) {
-                        cw.getUsageMetrics('CPUCreditUsage','Count','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbName}],startTime, endTime, period, callback);
+                        cw.getUsageMetrics('CPUCreditUsage','Count','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbInstanceIdentifier}],startTime, endTime, period, callback);
                     },
                     CPUCreditBalance: function (callback) {
-                        cw.getUsageMetrics('CPUCreditBalance','Count','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbName}],startTime, endTime, period, callback);
+                        cw.getUsageMetrics('CPUCreditBalance','Count','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbInstanceIdentifier}],startTime, endTime, period, callback);
                     },
                     DatabaseConnections: function (callback) {
-                        cw.getUsageMetrics('DatabaseConnections','Count','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbName}],startTime, endTime, period, callback);
+                        cw.getUsageMetrics('DatabaseConnections','Count','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbInstanceIdentifier}],startTime, endTime, period, callback);
                     },
                     DiskQueueDepth: function (callback) {
-                        cw.getUsageMetrics('DiskQueueDepth','Count','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbName}],startTime, endTime, period, callback);
+                        cw.getUsageMetrics('DiskQueueDepth','Count','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbInstanceIdentifier}],startTime, endTime, period, callback);
                     },
                     FreeableMemory: function (callback) {
-                        cw.getUsageMetrics('FreeableMemory','Bytes','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbName}],startTime, endTime, period, callback);
+                        cw.getUsageMetrics('FreeableMemory','Bytes','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbInstanceIdentifier}],startTime, endTime, period, callback);
                     },
                     FreeStorageSpace: function (callback) {
-                        cw.getUsageMetrics('FreeStorageSpace','Bytes','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbName}],startTime, endTime, period, callback);
+                        cw.getUsageMetrics('FreeStorageSpace','Bytes','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbInstanceIdentifier}],startTime, endTime, period, callback);
                     },
                     ReplicaLag: function (callback) {
-                        cw.getUsageMetrics('ReplicaLag','Seconds','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbName}],startTime, endTime, period, callback);
+                        cw.getUsageMetrics('ReplicaLag','Seconds','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbInstanceIdentifier}],startTime, endTime, period, callback);
                     },
                     SwapUsage: function (callback) {
-                        cw.getUsageMetrics('SwapUsage','Bytes','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbName}],startTime, endTime, period, callback);
+                        cw.getUsageMetrics('SwapUsage','Bytes','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbInstanceIdentifier}],startTime, endTime, period, callback);
                     },
                     ReadIOPS: function (callback) {
-                        cw.getUsageMetrics('ReadIOPS','Count/Second','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbName}],startTime, endTime, period, callback);
+                        cw.getUsageMetrics('ReadIOPS','Count/Second','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbInstanceIdentifier}],startTime, endTime, period, callback);
                     },
                     WriteIOPS: function (callback) {
-                        cw.getUsageMetrics('WriteIOPS','Count/Second','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbName}],startTime, endTime, period, callback);
+                        cw.getUsageMetrics('WriteIOPS','Count/Second','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbInstanceIdentifier}],startTime, endTime, period, callback);
                     },
                     ReadLatency: function (callback) {
-                        cw.getUsageMetrics('ReadLatency','Seconds','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbName}],startTime, endTime, period, callback);
+                        cw.getUsageMetrics('ReadLatency','Seconds','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbInstanceIdentifier}],startTime, endTime, period, callback);
                     },
                     WriteLatency: function (callback) {
-                        cw.getUsageMetrics('WriteLatency','Seconds','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbName}],startTime, endTime, period, callback);
+                        cw.getUsageMetrics('WriteLatency','Seconds','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbInstanceIdentifier}],startTime, endTime, period, callback);
                     },
                     ReadThroughput: function (callback) {
-                        cw.getUsageMetrics('ReadThroughput','Bytes/Second','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbName}],startTime, endTime, period, callback);
+                        cw.getUsageMetrics('ReadThroughput','Bytes/Second','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbInstanceIdentifier}],startTime, endTime, period, callback);
                     },
                     WriteThroughput: function (callback) {
-                        cw.getUsageMetrics('WriteThroughput','Bytes/Second','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbName}],startTime, endTime, period, callback);
+                        cw.getUsageMetrics('WriteThroughput','Bytes/Second','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbInstanceIdentifier}],startTime, endTime, period, callback);
                     },
                     NetworkReceiveThroughput: function (callback) {
-                        cw.getUsageMetrics('NetworkReceiveThroughput','Bytes/Second','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbName}],startTime, endTime, period, callback);
+                        cw.getUsageMetrics('NetworkReceiveThroughput','Bytes/Second','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbInstanceIdentifier}],startTime, endTime, period, callback);
                     },
                     NetworkTransmitThroughput: function (callback) {
-                        cw.getUsageMetrics('NetworkTransmitThroughput','Bytes/Second','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbName}],startTime, endTime, period, callback);
+                        cw.getUsageMetrics('NetworkTransmitThroughput','Bytes/Second','AWS/RDS',[{Name:'DBInstanceIdentifier',Value:rds.resourceDetails.dbInstanceIdentifier}],startTime, endTime, period, callback);
                     }
                 },
                 function (err, results) {
@@ -582,7 +582,7 @@ function getRDSDBInstanceMetrics(provider, dbInstances, startTime, endTime, peri
                             orgId: provider.orgId[0],
                             resourceId: rds._id,
                             platform: 'AWS',
-                            platformId: rds.resourceDetails.dbName,
+                            platformId: rds.resourceDetails.dbInstanceIdentifier,
                             resourceType: 'RDS',
                             startTime: dbStartTime,
                             endTime: dbEndTime,
@@ -782,6 +782,7 @@ function getRDSInstancesInfo(provider,orgName,callback) {
                             category:"unassigned",
                             isDeleted:false,
                             resourceDetails: {
+                                dbInstanceIdentifier: dbInstance.DBInstanceIdentifier,
                                 dbName: dbInstance.DBName,
                                 dbInstanceClass: dbInstance.DBInstanceClass,
                                 dbEngine: dbInstance.Engine,
@@ -807,17 +808,18 @@ function getRDSInstancesInfo(provider,orgName,callback) {
                                 storageType: dbInstance.StorageType,
                                 storageEncrypted: dbInstance.StorageEncrypted,
                                 dbiResourceId: dbInstance.DbiResourceId,
-                                accountNumber: 549974527830,
+                                accountNumber: appConfig.aws.s3AccountNumber,
                                 caCertificateIdentifier: dbInstance.CACertificateIdentifier
                             }
                         };
                         var params ={
-                            ResourceName:'arn:aws:rds:us-west-1:'+appConfig.aws.s3AccountNumber+':db:'+dbInstance.DBName
+                            ResourceName:'arn:aws:rds:us-west-1:'+appConfig.aws.s3AccountNumber+':db:'+dbInstance.DBInstanceIdentifier
                         };
                         rds.getRDSDBInstanceTag(params,function(err,rdsTags){
                             if(err){
                                 logger.error(err);
                                 callback(err,null);
+                                return;
                             }else{
                                 rdsDbInstanceObj.tags = rdsTags;
                                 rdsDbInstanceObj.projectTag = rdsTags['Owner'];
@@ -826,6 +828,7 @@ function getRDSInstancesInfo(provider,orgName,callback) {
                                 rdsDbInstanceObj={};
                                 if(dbInstances.length === results.length){
                                     callback(null,results);
+                                    return;
                                 }
                             }
                         })
@@ -981,7 +984,7 @@ function bulkUpdateAWSResourcesTags(provider, resources, callback) {
             for (var i = 0; i < resources.length; i++) {
                 (function (j) {
                     logger.debug('Updating tags for resource ', resources[j]._id);
-                    rds.addRDSDBInstanceTag(resources[j].resourceDetails.dbName, resources[j].tags,
+                    rds.addRDSDBInstanceTag(resources[j].resourceDetails.dbInstanceIdentifier, resources[j].tags,
                         function (err, data) {
                             if (err) {
                                 logger.error(err);