diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index 67f83dacaad4..7d7f9288ea3e 100644
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -18,8 +18,7 @@
 
 import static com.cloud.utils.NumbersUtil.toHumanReadableSize;
 
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
+
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,23 +37,14 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
 import javax.inject.Inject;
 
-import com.cloud.api.query.ResourceIdSupport;
-import com.cloud.bgp.ASNumber;
-import com.cloud.bgp.ASNumberRange;
-import com.cloud.configuration.ConfigurationService;
-import com.cloud.dc.ASNumberRangeVO;
-import com.cloud.dc.ASNumberVO;
-import com.cloud.dc.VlanDetailsVO;
-import com.cloud.dc.dao.ASNumberDao;
-import com.cloud.dc.dao.ASNumberRangeDao;
-import com.cloud.dc.dao.VlanDetailsDao;
-import com.cloud.hypervisor.Hypervisor;
-import com.cloud.network.vpc.VpcGateway;
-import com.cloud.storage.BucketVO;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
+
 import org.apache.cloudstack.affinity.AffinityGroup;
 import org.apache.cloudstack.affinity.AffinityGroupResponse;
 import org.apache.cloudstack.annotation.AnnotationService;
@@ -81,6 +71,7 @@
 import org.apache.cloudstack.api.response.BackupOfferingResponse;
 import org.apache.cloudstack.api.response.BackupRepositoryResponse;
 import org.apache.cloudstack.api.response.BackupScheduleResponse;
+
 import org.apache.cloudstack.api.response.BgpPeerResponse;
 import org.apache.cloudstack.api.response.BucketResponse;
 import org.apache.cloudstack.api.response.CapabilityResponse;
@@ -270,6 +261,7 @@
 import com.cloud.api.query.vo.ProjectAccountJoinVO;
 import com.cloud.api.query.vo.ProjectInvitationJoinVO;
 import com.cloud.api.query.vo.ProjectJoinVO;
+import com.cloud.api.query.ResourceIdSupport;
 import com.cloud.api.query.vo.ResourceTagJoinVO;
 import com.cloud.api.query.vo.SecurityGroupJoinVO;
 import com.cloud.api.query.vo.ServiceOfferingJoinVO;
@@ -280,14 +272,19 @@
 import com.cloud.api.query.vo.VolumeJoinVO;
 import com.cloud.api.query.vo.VpcOfferingJoinVO;
 import com.cloud.api.response.ApiResponseSerializer;
+import com.cloud.bgp.ASNumber;
+import com.cloud.bgp.ASNumberRange;
 import com.cloud.capacity.Capacity;
 import com.cloud.capacity.CapacityVO;
 import com.cloud.capacity.dao.CapacityDaoImpl.SummedCapacity;
 import com.cloud.configuration.ConfigurationManager;
+import com.cloud.configuration.ConfigurationService;
 import com.cloud.configuration.Resource.ResourceOwnerType;
 import com.cloud.configuration.Resource.ResourceType;
 import com.cloud.configuration.ResourceCount;
 import com.cloud.configuration.ResourceLimit;
+import com.cloud.dc.ASNumberRangeVO;
+import com.cloud.dc.ASNumberVO;
 import com.cloud.dc.ClusterDetailsDao;
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.DataCenter;
@@ -298,15 +295,21 @@
 import com.cloud.dc.StorageNetworkIpRange;
 import com.cloud.dc.Vlan;
 import com.cloud.dc.Vlan.VlanType;
+import com.cloud.dc.VlanDetailsVO;
 import com.cloud.dc.VlanVO;
+import com.cloud.dc.dao.ASNumberDao;
+import com.cloud.dc.dao.ASNumberRangeDao;
+import com.cloud.dc.dao.VlanDetailsDao;
 import com.cloud.domain.Domain;
 import com.cloud.domain.DomainVO;
+
 import com.cloud.event.Event;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.host.ControlState;
 import com.cloud.host.Host;
 import com.cloud.host.HostVO;
+import com.cloud.hypervisor.Hypervisor;
 import com.cloud.hypervisor.HypervisorCapabilities;
 import com.cloud.network.GuestVlan;
 import com.cloud.network.GuestVlanRange;
@@ -370,9 +373,11 @@
 import com.cloud.network.vpc.PrivateGateway;
 import com.cloud.network.vpc.StaticRoute;
 import com.cloud.network.vpc.Vpc;
+import com.cloud.network.vpc.VpcGateway;
 import com.cloud.network.vpc.VpcOffering;
 import com.cloud.network.vpc.VpcVO;
 import com.cloud.network.vpc.dao.VpcOfferingDao;
+
 import com.cloud.offering.DiskOffering;
 import com.cloud.offering.NetworkOffering;
 import com.cloud.offering.NetworkOffering.Detail;
@@ -391,6 +396,7 @@
 import com.cloud.server.ResourceTag;
 import com.cloud.server.ResourceTag.ResourceObjectType;
 import com.cloud.service.ServiceOfferingVO;
+import com.cloud.storage.BucketVO;
 import com.cloud.storage.DataStoreRole;
 import com.cloud.storage.DiskOfferingVO;
 import com.cloud.storage.GuestOS;
@@ -414,11 +420,13 @@
 import com.cloud.template.VirtualMachineTemplate;
 import com.cloud.user.Account;
 import com.cloud.user.AccountManager;
+
 import com.cloud.user.SSHKeyPair;
 import com.cloud.user.User;
 import com.cloud.user.UserAccount;
 import com.cloud.user.UserData;
 import com.cloud.user.UserStatisticsVO;
+
 import com.cloud.user.dao.UserDataDao;
 import com.cloud.user.dao.UserStatisticsDao;
 import com.cloud.uservm.UserVm;
@@ -449,7 +457,7 @@
 import com.cloud.vm.snapshot.VMSnapshotVO;
 import com.cloud.vm.snapshot.dao.VMSnapshotDao;
 
-import sun.security.x509.X509CertImpl;
+
 
 public class ApiResponseHelper implements ResponseGenerator, ResourceIdSupport {
 
@@ -531,6 +539,7 @@ public class ApiResponseHelper implements ResponseGenerator, ResourceIdSupport {
     BgpPeerDao bgpPeerDao;
     @Inject
     RoutedIpv4Manager routedIpv4Manager;
+
     @Inject
     ResourceIconManager resourceIconManager;
     @Inject
@@ -545,6 +554,8 @@ public static String getPrettyDomainPath(String path) {
         return domainPath.toString();
     }
 
+
+
     @Override
     public UserResponse createUserResponse(User user) {
         UserAccountJoinVO vUser = ApiDBUtils.newUserView(user);
@@ -797,7 +808,7 @@ public static DataStoreRole getDataStoreRole(Snapshot snapshot, SnapshotDataStor
 
         if (mapCapabilities != null) {
             String value = mapCapabilities.get(DataStoreCapabilities.STORAGE_SYSTEM_SNAPSHOT.toString());
-            Boolean supportsStorageSystemSnapshots = new Boolean(value);
+            boolean supportsStorageSystemSnapshots = Boolean.getBoolean(value);
 
             if (supportsStorageSystemSnapshots) {
                 return DataStoreRole.Primary;
@@ -1659,7 +1670,6 @@ public FirewallRuleResponse createPortForwardingRuleResponse(PortForwardingRule
         Network guestNtwk = ApiDBUtils.findNetworkById(fwRule.getNetworkId());
         response.setNetworkId(guestNtwk.getUuid());
 
-
         IpAddress ip = ApiDBUtils.findIpAddressById(fwRule.getSourceIpAddressId());
 
         if (ip != null)
@@ -1910,6 +1920,8 @@ public UserVm findUserVmById(Long vmId) {
 
     }
 
+
+
     @Override
     public VolumeVO findVolumeById(Long volumeId) {
         return ApiDBUtils.findVolumeById(volumeId);
@@ -2859,6 +2871,8 @@ public NetworkResponse createNetworkResponse(ResponseView view, Network network)
             }
         }
 
+
+
         response.setObjectName("network");
         return response;
     }
@@ -3061,6 +3075,8 @@ public static void populateOwner(ControlledViewEntityResponse response, Controll
         response.setDomainPath(getPrettyDomainPath(object.getDomainPath()));
     }
 
+
+
     private void populateAccount(ControlledEntityResponse response, long accountId) {
         Account account = ApiDBUtils.findAccountById(accountId);
         if (account == null) {
@@ -3272,6 +3288,7 @@ public TrafficTypeResponse createTrafficTypeResponse(PhysicalNetworkTrafficType
         PhysicalNetwork pnet = ApiDBUtils.findPhysicalNetworkById(result.getPhysicalNetworkId());
         if (pnet != null) {
             response.setPhysicalNetworkId(pnet.getUuid());
+
         }
         if (result.getTrafficType() != null) {
             response.setTrafficType(result.getTrafficType().toString());
@@ -3283,6 +3300,7 @@ public TrafficTypeResponse createTrafficTypeResponse(PhysicalNetworkTrafficType
         response.setHypervLabel(result.getHypervNetworkLabel());
         response.setOvm3Label(result.getOvm3NetworkLabel());
 
+
         response.setObjectName("traffictype");
         return response;
     }
@@ -3508,6 +3526,7 @@ public VpcResponse createVpcResponse(ResponseView view, Vpc vpc) {
         if (voff != null) {
             response.setVpcOfferingId(voff.getUuid());
             response.setVpcOfferingName(voff.getName());
+
         }
         response.setCidr(vpc.getCidr());
         response.setRestartRequired(vpc.isRestartRequired());
@@ -3603,6 +3622,7 @@ public VpcResponse createVpcResponse(ResponseView view, Vpc vpc) {
             }
         }
 
+
         response.setObjectName("vpc");
         return response;
     }
@@ -3896,6 +3916,9 @@ public Site2SiteCustomerGatewayResponse createSite2SiteCustomerGatewayResponse(S
         response.setRemoved(result.getRemoved());
         response.setIkeVersion(result.getIkeVersion());
         response.setSplitConnections(result.getSplitConnections());
+
+
+
         response.setObjectName("vpncustomergateway");
         response.setHasAnnotation(annotationDao.hasAnnotations(result.getUuid(), AnnotationService.EntityType.VPN_CUSTOMER_GATEWAY.name(),
                 _accountMgr.isRootAdmin(CallContext.current().getCallingAccount().getId())));
@@ -4116,474 +4139,602 @@ public UsageRecordResponse createUsageResponse(Usage usageRecord, Map<String, Se
             }
         }
 
-        ResourceTag.ResourceObjectType resourceType = null;
-        Long resourceId = null;
+        UsageResourceDetails resourceDetails = populateUsageTypeSpecificDetails(usageRecord, usageRecResponse, oldFormat, vmInstance, template);
+        if (resourceTagResponseMap != null && resourceDetails.resourceId != null && resourceDetails.resourceType != null) {
+            final String tagKey = resourceDetails.resourceId + ":" + resourceDetails.resourceType;
+            if (resourceTagResponseMap.get(tagKey) != null) {
+                usageRecResponse.setTags(resourceTagResponseMap.get(tagKey));
+            }
+        }
+
+        if (usageRecord.getRawUsage() != null) {
+            DecimalFormat decimalFormat = new DecimalFormat("###########.######");
+            usageRecResponse.setRawUsage(decimalFormat.format(usageRecord.getRawUsage()));
+        }
+
+        if (usageRecord.getStartDate() != null) {
+            usageRecResponse.setStartDate(usageRecord.getStartDate());
+        }
+        if (usageRecord.getEndDate() != null) {
+            usageRecResponse.setEndDate(usageRecord.getEndDate());
+        }
+
+        return usageRecResponse;
+    }
+
+    private UsageResourceDetails populateUsageTypeSpecificDetails(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat,
+            VMInstanceVO vmInstance, VMTemplateVO template) {
         if (usageRecord.getUsageType() == UsageTypes.RUNNING_VM || usageRecord.getUsageType() == UsageTypes.ALLOCATED_VM) {
-            ServiceOfferingVO svcOffering = _entityMgr.findByIdIncludingRemoved(ServiceOfferingVO.class, usageRecord.getOfferingId().toString());
-            //Service Offering Id
-            if(svcOffering != null) {
-                usageRecResponse.setOfferingId(svcOffering.getUuid());
-            }
-            //VM Instance ID
-            VMInstanceVO vm = null;
-            if (usageRecord.getUsageId() != null && usageRecord.getUsageId().equals(usageRecord.getVmInstanceId())) {
-                vm = vmInstance;
-            } else {
-                vm = _entityMgr.findByIdIncludingRemoved(VMInstanceVO.class, usageRecord.getUsageId().toString());
+            return populateRunningOrAllocatedVmUsageResponse(usageRecord, usageRecResponse, oldFormat, vmInstance, template);
+        } else if (usageRecord.getUsageType() == UsageTypes.IP_ADDRESS) {
+            return populateIpAddressUsageResponse(usageRecord, usageRecResponse);
+        } else if (usageRecord.getUsageType() == UsageTypes.NETWORK_BYTES_SENT || usageRecord.getUsageType() == UsageTypes.NETWORK_BYTES_RECEIVED) {
+            return populateNetworkBytesUsageResponse(usageRecord, usageRecResponse, oldFormat);
+        } else if (usageRecord.getUsageType() == UsageTypes.VM_DISK_IO_READ || usageRecord.getUsageType() == UsageTypes.VM_DISK_IO_WRITE
+                || usageRecord.getUsageType() == UsageTypes.VM_DISK_BYTES_READ || usageRecord.getUsageType() == UsageTypes.VM_DISK_BYTES_WRITE) {
+            return populateVmDiskUsageResponse(usageRecord, usageRecResponse, oldFormat, vmInstance);
+        } else if (usageRecord.getUsageType() == UsageTypes.VOLUME) {
+            return populateVolumeUsageResponse(usageRecord, usageRecResponse, oldFormat, vmInstance, template);
+        } else if (usageRecord.getUsageType() == UsageTypes.TEMPLATE || usageRecord.getUsageType() == UsageTypes.ISO) {
+            return populateTemplateOrIsoUsageResponse(usageRecord, usageRecResponse, oldFormat);
+        } else if (usageRecord.getUsageType() == UsageTypes.SNAPSHOT) {
+            return populateSnapshotUsageResponse(usageRecord, usageRecResponse, oldFormat);
+        } else if (usageRecord.getUsageType() == UsageTypes.LOAD_BALANCER_POLICY) {
+            return populateLoadBalancerPolicyUsageResponse(usageRecord, usageRecResponse, oldFormat);
+        } else if (usageRecord.getUsageType() == UsageTypes.PORT_FORWARDING_RULE) {
+            return populatePortForwardingRuleUsageResponse(usageRecord, usageRecResponse, oldFormat);
+        } else if (usageRecord.getUsageType() == UsageTypes.NETWORK_OFFERING) {
+            return populateNetworkOfferingUsageResponse(usageRecord, usageRecResponse, oldFormat, vmInstance);
+        } else if (usageRecord.getUsageType() == UsageTypes.VPN_USERS) {
+            return populateVpnUsersUsageResponse(usageRecord, usageRecResponse, oldFormat);
+        } else if (usageRecord.getUsageType() == UsageTypes.SECURITY_GROUP) {
+            return populateSecurityGroupUsageResponse(usageRecord, usageRecResponse, oldFormat, vmInstance);
+        } else if (usageRecord.getUsageType() == UsageTypes.BACKUP) {
+            return populateBackupUsageResponse(usageRecord, usageRecResponse, vmInstance);
+        } else if (usageRecord.getUsageType() == UsageTypes.VM_SNAPSHOT) {
+            return populateVmSnapshotUsageResponse(usageRecord, usageRecResponse, oldFormat, vmInstance);
+        } else if (usageRecord.getUsageType() == UsageTypes.VOLUME_SECONDARY) {
+            return populateVolumeSecondaryUsageResponse(usageRecord, usageRecResponse, oldFormat);
+        } else if (usageRecord.getUsageType() == UsageTypes.VM_SNAPSHOT_ON_PRIMARY) {
+            return populateVmSnapshotOnPrimaryUsageResponse(usageRecord, usageRecResponse, oldFormat, vmInstance);
+        } else if (usageRecord.getUsageType() == UsageTypes.BUCKET) {
+            return populateBucketUsageResponse(usageRecord, usageRecResponse);
+        }
+
+        return new UsageResourceDetails();
+    }
+
+    private UsageResourceDetails populateRunningOrAllocatedVmUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat,
+            VMInstanceVO vmInstance, VMTemplateVO template) {
+        UsageResourceDetails resourceDetails = new UsageResourceDetails();
+        ServiceOfferingVO svcOffering = _entityMgr.findByIdIncludingRemoved(ServiceOfferingVO.class, usageRecord.getOfferingId());
+        //Service Offering Id
+        if(svcOffering != null) {
+            usageRecResponse.setOfferingId(svcOffering.getUuid());
+        }
+        //VM Instance ID
+        VMInstanceVO vm = null;
+        if (usageRecord.getUsageId() != null && usageRecord.getUsageId().equals(usageRecord.getVmInstanceId())) {
+            vm = vmInstance;
+        } else {
+            vm = _entityMgr.findByIdIncludingRemoved(VMInstanceVO.class, usageRecord.getUsageId());
+        }
+        if (vm != null) {
+            resourceDetails.resourceType = ResourceTag.ResourceObjectType.UserVm;
+            usageRecResponse.setUsageId(vm.getUuid());
+            resourceDetails.resourceId = vm.getId();
+            final GuestOS guestOS = _guestOsDao.findById(vm.getGuestOSId());
+            if (guestOS != null) {
+                usageRecResponse.setOsTypeId(guestOS.getUuid());
+                usageRecResponse.setOsDisplayName(guestOS.getDisplayName());
+                final GuestOsCategory guestOsCategory = _guestOsCategoryDao.findById(guestOS.getCategoryId());
+                if (guestOsCategory != null) {
+                    usageRecResponse.setOsCategoryId(guestOsCategory.getUuid());
+                    usageRecResponse.setOsCategoryName(guestOsCategory.getName());
+                }
+            }
+        }
+        //Hypervisor Type
+        usageRecResponse.setType(usageRecord.getType());
+        //Dynamic compute offerings details
+        if (usageRecord.getCpuCores() != null) {
+            usageRecResponse.setCpuNumber(usageRecord.getCpuCores());
+        } else if (svcOffering != null && svcOffering.getCpu() != null) {
+            usageRecResponse.setCpuNumber(svcOffering.getCpu().longValue());
+        }
+        if (usageRecord.getCpuSpeed() != null) {
+            usageRecResponse.setCpuSpeed(usageRecord.getCpuSpeed());
+        } else if (svcOffering != null && svcOffering.getSpeed() != null) {
+            usageRecResponse.setCpuSpeed(svcOffering.getSpeed().longValue());
+        }
+        if (usageRecord.getMemory() != null) {
+            usageRecResponse.setMemory(usageRecord.getMemory());
+        } else if (svcOffering != null && svcOffering.getRamSize() != null) {
+            usageRecResponse.setMemory(svcOffering.getRamSize().longValue());
+        }
+        if (!oldFormat) {
+            final StringBuilder builder = new StringBuilder();
+            if (usageRecord.getUsageType() == UsageTypes.RUNNING_VM) {
+                builder.append("Running VM usage ");
+            } else if(usageRecord.getUsageType() == UsageTypes.ALLOCATED_VM) {
+                builder.append("Allocated VM usage ");
             }
             if (vm != null) {
-                resourceType = ResourceTag.ResourceObjectType.UserVm;
-                usageRecResponse.setUsageId(vm.getUuid());
-                resourceId = vm.getId();
-                final GuestOS guestOS = _guestOsDao.findById(vm.getGuestOSId());
-                if (guestOS != null) {
-                    usageRecResponse.setOsTypeId(guestOS.getUuid());
-                    usageRecResponse.setOsDisplayName(guestOS.getDisplayName());
-                    final GuestOsCategory guestOsCategory = _guestOsCategoryDao.findById(guestOS.getCategoryId());
-                    if (guestOsCategory != null) {
-                        usageRecResponse.setOsCategoryId(guestOsCategory.getUuid());
-                        usageRecResponse.setOsCategoryName(guestOsCategory.getName());
-                    }
-                }
+                builder.append("for ").append(vm.getHostName()).append(" (").append(vm.getInstanceName()).append(") (").append(vm.getUuid()).append(") ");
             }
-            //Hypervisor Type
-            usageRecResponse.setType(usageRecord.getType());
-            //Dynamic compute offerings details
-            if(usageRecord.getCpuCores() != null) {
-                usageRecResponse.setCpuNumber(usageRecord.getCpuCores());
-            } else if (svcOffering.getCpu() != null){
-                usageRecResponse.setCpuNumber(svcOffering.getCpu().longValue());
-            }
-            if(usageRecord.getCpuSpeed() != null) {
-                usageRecResponse.setCpuSpeed(usageRecord.getCpuSpeed());
-            } else if(svcOffering.getSpeed() != null){
-                usageRecResponse.setCpuSpeed(svcOffering.getSpeed().longValue());
-            }
-            if(usageRecord.getMemory() != null) {
-                usageRecResponse.setMemory(usageRecord.getMemory());
-            } else if(svcOffering.getRamSize() != null) {
-                usageRecResponse.setMemory(svcOffering.getRamSize().longValue());
-            }
-            if (!oldFormat) {
-                final StringBuilder builder = new StringBuilder();
-                if (usageRecord.getUsageType() == UsageTypes.RUNNING_VM) {
-                    builder.append("Running VM usage ");
-                } else if(usageRecord.getUsageType() == UsageTypes.ALLOCATED_VM) {
-                    builder.append("Allocated VM usage ");
-                }
-                if (vm != null) {
-                    builder.append("for ").append(vm.getHostName()).append(" (").append(vm.getInstanceName()).append(") (").append(vm.getUuid()).append(") ");
-                }
-                if (svcOffering != null) {
-                    builder.append("using service offering ").append(svcOffering.getName()).append(" (").append(svcOffering.getUuid()).append(") ");
-                }
-                if (template != null) {
-                    builder.append("and template ").append(template.getName()).append(" (").append(template.getUuid()).append(")");
-                }
-                usageRecResponse.setDescription(builder.toString());
+            if (svcOffering != null) {
+                builder.append("using service offering ").append(svcOffering.getName()).append(" (").append(svcOffering.getUuid()).append(") ");
             }
-        } else if (usageRecord.getUsageType() == UsageTypes.IP_ADDRESS) {
-            //IP Address ID
-            IPAddressVO ip = _entityMgr.findByIdIncludingRemoved(IPAddressVO.class, usageRecord.getUsageId().toString());
-            if (ip != null) {
-                Long networkId = ip.getAssociatedWithNetworkId();
-                if (networkId == null) {
-                    networkId = ip.getSourceNetworkId();
-                }
-                resourceType = ResourceObjectType.PublicIpAddress;
-                resourceId = ip.getId();
-                usageRecResponse.setUsageId(ip.getUuid());
-            }
-            //isSourceNAT
-            usageRecResponse.setSourceNat((usageRecord.getType().equals("SourceNat")) ? true : false);
-            //isSystem
-            usageRecResponse.setSystem((usageRecord.getSize() == 1) ? true : false);
-        } else if (usageRecord.getUsageType() == UsageTypes.NETWORK_BYTES_SENT || usageRecord.getUsageType() == UsageTypes.NETWORK_BYTES_RECEIVED) {
-            //Device Type
-            resourceType = ResourceObjectType.UserVm;
-            usageRecResponse.setType(usageRecord.getType());
-            VMInstanceVO vm = null;
-            HostVO host = null;
-            if (usageRecord.getType().equals("DomainRouter") || usageRecord.getType().equals("UserVm")) {
-                //Domain Router Id
-                vm = _entityMgr.findByIdIncludingRemoved(VMInstanceVO.class, usageRecord.getUsageId().toString());
-                if (vm != null) {
-                    resourceId = vm.getId();
-                    usageRecResponse.setUsageId(vm.getUuid());
-                }
-            } else {
-                //External Device Host Id
-                host = _entityMgr.findByIdIncludingRemoved(HostVO.class, usageRecord.getUsageId().toString());
-                if (host != null) {
-                    usageRecResponse.setUsageId(host.getUuid());
-                }
+            if (template != null) {
+                builder.append("and template ").append(template.getName()).append(" (").append(template.getUuid()).append(")");
             }
-            //Network ID
-            NetworkVO network = null;
-            if((usageRecord.getNetworkId() != null) && (usageRecord.getNetworkId() != 0)) {
-                network = _entityMgr.findByIdIncludingRemoved(NetworkVO.class, usageRecord.getNetworkId().toString());
-                if (network != null) {
-                    resourceType = ResourceObjectType.Network;
-                    if (network.getTrafficType() == TrafficType.Public) {
-                        VirtualRouter router = ApiDBUtils.findDomainRouterById(usageRecord.getUsageId());
-                        Vpc vpc = ApiDBUtils.findVpcByIdIncludingRemoved(router.getVpcId());
+            usageRecResponse.setDescription(builder.toString());
+        }
+        return resourceDetails;
+    }
+
+    private UsageResourceDetails populateIpAddressUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse) {
+        UsageResourceDetails resourceDetails = new UsageResourceDetails();
+        //IP Address ID
+        IPAddressVO ip = _entityMgr.findByIdIncludingRemoved(IPAddressVO.class, usageRecord.getUsageId());
+        if (ip != null) {
+            resourceDetails.resourceType = ResourceObjectType.PublicIpAddress;
+            resourceDetails.resourceId = ip.getId();
+            usageRecResponse.setUsageId(ip.getUuid());
+        }
+        //isSourceNAT
+        usageRecResponse.setSourceNat((usageRecord.getType().equals("SourceNat")) ? true : false);
+        //isSystem
+        usageRecResponse.setSystem((usageRecord.getSize() == 1) ? true : false);
+        return resourceDetails;
+    }
+
+    private UsageResourceDetails populateNetworkBytesUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat) {
+        UsageResourceDetails resourceDetails = new UsageResourceDetails();
+        //Device Type
+        resourceDetails.resourceType = ResourceObjectType.UserVm;
+        usageRecResponse.setType(usageRecord.getType());
+        VMInstanceVO vm = null;
+        HostVO host = null;
+        if (usageRecord.getType().equals("DomainRouter") || usageRecord.getType().equals("UserVm")) {
+            //Domain Router Id
+            vm = _entityMgr.findByIdIncludingRemoved(VMInstanceVO.class, usageRecord.getUsageId());
+            if (vm != null) {
+                resourceDetails.resourceId = vm.getId();
+                usageRecResponse.setUsageId(vm.getUuid());
+            }
+        } else {
+            //External Device Host Id
+            host = _entityMgr.findByIdIncludingRemoved(HostVO.class, usageRecord.getUsageId());
+            if (host != null) {
+                usageRecResponse.setUsageId(host.getUuid());
+            }
+        }
+        //Network ID
+        NetworkVO network = null;
+        if((usageRecord.getNetworkId() != null) && (usageRecord.getNetworkId() != 0)) {
+            network = _entityMgr.findByIdIncludingRemoved(NetworkVO.class, usageRecord.getNetworkId());
+            if (network != null) {
+                resourceDetails.resourceType = ResourceObjectType.Network;
+                if (network.getTrafficType() == TrafficType.Public) {
+                    VirtualRouter router = ApiDBUtils.findDomainRouterById(usageRecord.getUsageId());
+                    Vpc vpc = router != null && router.getVpcId() != null ? ApiDBUtils.findVpcByIdIncludingRemoved(router.getVpcId()) : null;
+                    if (vpc != null) {
                         usageRecResponse.setVpcId(vpc.getUuid());
-                        resourceId = vpc.getId();
+                        resourceDetails.resourceId = vpc.getId();
                     } else {
                         usageRecResponse.setNetworkId(network.getUuid());
-                        resourceId = network.getId();
+                        resourceDetails.resourceId = network.getId();
                     }
-                    usageRecResponse.setResourceName(network.getName());
+                } else {
+                    usageRecResponse.setNetworkId(network.getUuid());
+                    resourceDetails.resourceId = network.getId();
                 }
+                usageRecResponse.setResourceName(network.getName());
             }
-            if (!oldFormat) {
-                final StringBuilder builder = new StringBuilder();
-                if (usageRecord.getUsageType() == UsageTypes.NETWORK_BYTES_SENT) {
-                    builder.append("Bytes sent by network ");
-                } else if (usageRecord.getUsageType() == UsageTypes.NETWORK_BYTES_RECEIVED) {
-                    builder.append("Bytes received by network ");
-                }
-                if (network != null) {
-                    if (network.getName() != null) {
-                        builder.append(network.getName());
-                    }
-                    if (network.getUuid() != null){
-                        builder.append(" (").append(network.getUuid()).append(") ");
-                    }
-                    builder.append(" " + toHumanReadableSize(usageRecord.getRawUsage().longValue())  + " ");
-                }
-                if (vm != null) {
-                    builder.append("using router ").append(vm.getInstanceName()).append(" (").append(vm.getUuid()).append(")");
-                } else if (host != null) {
-                    builder.append("using host ").append(host.getName()).append(" (").append(host.getUuid()).append(")");
-                }
-                usageRecResponse.setDescription(builder.toString());
+        }
+        if (!oldFormat) {
+            final StringBuilder builder = new StringBuilder();
+            if (usageRecord.getUsageType() == UsageTypes.NETWORK_BYTES_SENT) {
+                builder.append("Bytes sent by network ");
+            } else if (usageRecord.getUsageType() == UsageTypes.NETWORK_BYTES_RECEIVED) {
+                builder.append("Bytes received by network ");
             }
-        } else if (usageRecord.getUsageType() == UsageTypes.VM_DISK_IO_READ || usageRecord.getUsageType() == UsageTypes.VM_DISK_IO_WRITE
-                || usageRecord.getUsageType() == UsageTypes.VM_DISK_BYTES_READ || usageRecord.getUsageType() == UsageTypes.VM_DISK_BYTES_WRITE) {
-            //Device Type
-            usageRecResponse.setType(usageRecord.getType());
-            resourceType = ResourceObjectType.Volume;
-            //Volume ID
-            VolumeVO volume = _entityMgr.findByIdIncludingRemoved(VolumeVO.class, usageRecord.getUsageId().toString());
-            if (volume != null) {
-                usageRecResponse.setUsageId(volume.getUuid());
-                resourceId = volume.getId();
-            }
-            if (!oldFormat) {
-                final StringBuilder builder = new StringBuilder();
-                if (usageRecord.getUsageType() == UsageTypes.VM_DISK_IO_READ) {
-                    builder.append("Disk I/O read requests");
-                } else if (usageRecord.getUsageType() == UsageTypes.VM_DISK_IO_WRITE) {
-                    builder.append("Disk I/O write requests");
-                } else if (usageRecord.getUsageType() == UsageTypes.VM_DISK_BYTES_READ) {
-                    builder.append("Disk I/O read bytes");
-                } else if (usageRecord.getUsageType() == UsageTypes.VM_DISK_BYTES_WRITE) {
-                    builder.append("Disk I/O write bytes");
-                }
-                if (vmInstance != null) {
-                    builder.append(" for VM ").append(vmInstance.getHostName()).append(" (").append(vmInstance.getUuid()).append(")");
-                }
-                if (volume != null) {
-                    builder.append(" and volume ").append(volume.getName()).append(" (").append(volume.getUuid()).append(")");
+            if (network != null) {
+                if (network.getName() != null) {
+                    builder.append(network.getName());
                 }
-                if (usageRecord.getRawUsage()!= null){
-                    builder.append(" " + toHumanReadableSize(usageRecord.getRawUsage().longValue()));
+                if (network.getUuid() != null){
+                    builder.append(" (").append(network.getUuid()).append(") ");
                 }
-                usageRecResponse.setDescription(builder.toString());
+                builder.append(" " + toHumanReadableSize(usageRecord.getRawUsage().longValue())  + " ");
+            }
+            if (vm != null) {
+                builder.append("using router ").append(vm.getInstanceName()).append(" (").append(vm.getUuid()).append(")");
+            } else if (host != null) {
+                builder.append("using host ").append(host.getName()).append(" (").append(host.getUuid()).append(")");
+            }
+            usageRecResponse.setDescription(builder.toString());
+        }
+        return resourceDetails;
+    }
+
+    private UsageResourceDetails populateVmDiskUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat, VMInstanceVO vmInstance) {
+        UsageResourceDetails resourceDetails = new UsageResourceDetails();
+        //Device Type
+        usageRecResponse.setType(usageRecord.getType());
+        resourceDetails.resourceType = ResourceObjectType.Volume;
+        //Volume ID
+        VolumeVO volume = _entityMgr.findByIdIncludingRemoved(VolumeVO.class, usageRecord.getUsageId());
+        if (volume != null) {
+            usageRecResponse.setUsageId(volume.getUuid());
+            resourceDetails.resourceId = volume.getId();
+        }
+        if (!oldFormat) {
+            final StringBuilder builder = new StringBuilder();
+            if (usageRecord.getUsageType() == UsageTypes.VM_DISK_IO_READ) {
+                builder.append("Disk I/O read requests");
+            } else if (usageRecord.getUsageType() == UsageTypes.VM_DISK_IO_WRITE) {
+                builder.append("Disk I/O write requests");
+            } else if (usageRecord.getUsageType() == UsageTypes.VM_DISK_BYTES_READ) {
+                builder.append("Disk I/O read bytes");
+            } else if (usageRecord.getUsageType() == UsageTypes.VM_DISK_BYTES_WRITE) {
+                builder.append("Disk I/O write bytes");
+            }
+            if (vmInstance != null) {
+                builder.append(" for VM ").append(vmInstance.getHostName()).append(" (").append(vmInstance.getUuid()).append(")");
             }
-        } else if (usageRecord.getUsageType() == UsageTypes.VOLUME) {
-            //Volume ID
-            VolumeVO volume = _entityMgr.findByIdIncludingRemoved(VolumeVO.class, usageRecord.getUsageId().toString());
-            resourceType = ResourceObjectType.Volume;
             if (volume != null) {
-                usageRecResponse.setUsageId(volume.getUuid());
-                resourceId = volume.getId();
+                builder.append(" and volume ").append(volume.getName()).append(" (").append(volume.getUuid()).append(")");
             }
-            //Volume Size
-            usageRecResponse.setSize(usageRecord.getSize());
-            //Disk Offering Id
-            DiskOfferingVO diskOff = null;
-            if (usageRecord.getOfferingId() != null) {
-                diskOff = _entityMgr.findByIdIncludingRemoved(DiskOfferingVO.class, usageRecord.getOfferingId().toString());
+            if (usageRecord.getRawUsage()!= null){
+                builder.append(" " + toHumanReadableSize(usageRecord.getRawUsage().longValue()));
+            }
+            usageRecResponse.setDescription(builder.toString());
+        }
+        return resourceDetails;
+    }
+
+    private UsageResourceDetails populateVolumeUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat,
+            VMInstanceVO vmInstance, VMTemplateVO template) {
+        UsageResourceDetails resourceDetails = new UsageResourceDetails();
+        //Volume ID
+        VolumeVO volume = _entityMgr.findByIdIncludingRemoved(VolumeVO.class, usageRecord.getUsageId());
+        resourceDetails.resourceType = ResourceObjectType.Volume;
+        if (volume != null) {
+            usageRecResponse.setUsageId(volume.getUuid());
+            resourceDetails.resourceId = volume.getId();
+        }
+        //Volume Size
+        usageRecResponse.setSize(usageRecord.getSize());
+        //Disk Offering Id
+        DiskOfferingVO diskOff = null;
+        if (usageRecord.getOfferingId() != null) {
+            diskOff = _entityMgr.findByIdIncludingRemoved(DiskOfferingVO.class, usageRecord.getOfferingId());
+            if (diskOff != null) {
                 usageRecResponse.setOfferingId(diskOff.getUuid());
             }
-            if (!oldFormat) {
-                final StringBuilder builder = new StringBuilder();
-                builder.append("Volume usage ");
-                if (volume != null) {
-                    builder.append("for ").append(volume.getName()).append(" (").append(volume.getUuid()).append(")");
-                }
-                if (vmInstance != null) {
-                    builder.append(" attached to VM ").append(vmInstance.getHostName()).append(" (").append(vmInstance.getUuid()).append(")");
-                }
-                if (diskOff != null) {
-                    builder.append(" with disk offering ").append(diskOff.getName()).append(" (").append(diskOff.getUuid()).append(")");
-                }
-                if (template != null) {
-                    builder.append(" and template ").append(template.getName()).append(" (").append(template.getUuid()).append(")");
-                }
-                if (usageRecord.getSize() != null) {
-                    builder.append(" and size " + toHumanReadableSize(usageRecord.getSize()));
-                }
-                usageRecResponse.setDescription(builder.toString());
+        }
+        if (!oldFormat) {
+            final StringBuilder builder = new StringBuilder();
+            builder.append("Volume usage ");
+            if (volume != null) {
+                builder.append("for ").append(volume.getName()).append(" (").append(volume.getUuid()).append(")");
+            }
+            if (vmInstance != null) {
+                builder.append(" attached to VM ").append(vmInstance.getHostName()).append(" (").append(vmInstance.getUuid()).append(")");
+            }
+            if (diskOff != null) {
+                builder.append(" with disk offering ").append(diskOff.getName()).append(" (").append(diskOff.getUuid()).append(")");
+            }
+            if (template != null) {
+                builder.append(" and template ").append(template.getName()).append(" (").append(template.getUuid()).append(")");
+            }
+            if (usageRecord.getSize() != null) {
+                builder.append(" and size " + toHumanReadableSize(usageRecord.getSize()));
+            }
+            usageRecResponse.setDescription(builder.toString());
+        }
+        return resourceDetails;
+    }
+
+    private UsageResourceDetails populateTemplateOrIsoUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat) {
+        UsageResourceDetails resourceDetails = new UsageResourceDetails();
+        //Template/ISO ID
+        VMTemplateVO tmpl = _entityMgr.findByIdIncludingRemoved(VMTemplateVO.class, usageRecord.getUsageId());
+        if (tmpl != null) {
+            usageRecResponse.setUsageId(tmpl.getUuid());
+            resourceDetails.resourceId = tmpl.getId();
+        }
+        //Template/ISO Size
+        usageRecResponse.setSize(usageRecord.getSize());
+        if (usageRecord.getUsageType() == UsageTypes.ISO) {
+            usageRecResponse.setVirtualSize(usageRecord.getSize());
+            resourceDetails.resourceType = ResourceObjectType.ISO;
+        } else {
+            usageRecResponse.setVirtualSize(usageRecord.getVirtualSize());
+            resourceDetails.resourceType = ResourceObjectType.Template;
+        }
+        if (!oldFormat) {
+            final StringBuilder builder = new StringBuilder();
+            if (usageRecord.getUsageType() == UsageTypes.TEMPLATE) {
+                builder.append("Template usage");
+            } else if (usageRecord.getUsageType() == UsageTypes.ISO) {
+                builder.append("ISO usage");
             }
-        } else if (usageRecord.getUsageType() == UsageTypes.TEMPLATE || usageRecord.getUsageType() == UsageTypes.ISO) {
-            //Template/ISO ID
-            VMTemplateVO tmpl = _entityMgr.findByIdIncludingRemoved(VMTemplateVO.class, usageRecord.getUsageId().toString());
             if (tmpl != null) {
-                usageRecResponse.setUsageId(tmpl.getUuid());
-                resourceId = tmpl.getId();
-            }
-            //Template/ISO Size
-            usageRecResponse.setSize(usageRecord.getSize());
-            if (usageRecord.getUsageType() == UsageTypes.ISO) {
-                usageRecResponse.setVirtualSize(usageRecord.getSize());
-                resourceType = ResourceObjectType.ISO;
-            } else {
-                usageRecResponse.setVirtualSize(usageRecord.getVirtualSize());
-                resourceType = ResourceObjectType.Template;
-            }
-            if (!oldFormat) {
-                final StringBuilder builder = new StringBuilder();
-                if (usageRecord.getUsageType() == UsageTypes.TEMPLATE) {
-                    builder.append("Template usage");
-                } else if (usageRecord.getUsageType() == UsageTypes.ISO) {
-                    builder.append("ISO usage");
-                }
-                if (tmpl != null) {
-                    builder.append(" for ").append(tmpl.getName()).append(" (").append(tmpl.getUuid()).append(") ")
-                            .append("with size ").append(toHumanReadableSize(usageRecord.getSize())).append(" and virtual size ").append(toHumanReadableSize(usageRecord.getVirtualSize()));
-                }
-                usageRecResponse.setDescription(builder.toString());
+                builder.append(" for ").append(tmpl.getName()).append(" (").append(tmpl.getUuid()).append(") ")
+                        .append("with size ").append(toHumanReadableSize(usageRecord.getSize())).append(" and virtual size ").append(toHumanReadableSize(usageRecord.getVirtualSize()));
             }
-        } else if (usageRecord.getUsageType() == UsageTypes.SNAPSHOT) {
-            //Snapshot ID
-            SnapshotVO snap = _entityMgr.findByIdIncludingRemoved(SnapshotVO.class, usageRecord.getUsageId().toString());
-            resourceType = ResourceObjectType.Snapshot;
+            usageRecResponse.setDescription(builder.toString());
+        }
+        return resourceDetails;
+    }
+
+    private UsageResourceDetails populateSnapshotUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat) {
+        UsageResourceDetails resourceDetails = new UsageResourceDetails();
+        //Snapshot ID
+        SnapshotVO snap = _entityMgr.findByIdIncludingRemoved(SnapshotVO.class, usageRecord.getUsageId());
+        resourceDetails.resourceType = ResourceObjectType.Snapshot;
+        if (snap != null) {
+            usageRecResponse.setUsageId(snap.getUuid());
+            resourceDetails.resourceId = snap.getId();
+        }
+        //Snapshot Size
+        usageRecResponse.setSize(usageRecord.getSize());
+        if (!oldFormat) {
+            final StringBuilder builder = new StringBuilder();
+            builder.append("Snapshot usage ");
             if (snap != null) {
-                usageRecResponse.setUsageId(snap.getUuid());
-                resourceId = snap.getId();
-            }
-            //Snapshot Size
-            usageRecResponse.setSize(usageRecord.getSize());
-            if (!oldFormat) {
-                final StringBuilder builder = new StringBuilder();
-                builder.append("Snapshot usage ");
-                if (snap != null) {
-                    builder.append("for ").append(snap.getName()).append(" (").append(snap.getUuid()).append(") ")
-                            .append("with size ").append(toHumanReadableSize(usageRecord.getSize()));
-                }
-                usageRecResponse.setDescription(builder.toString());
+                builder.append("for ").append(snap.getName()).append(" (").append(snap.getUuid()).append(") ")
+                        .append("with size ").append(toHumanReadableSize(usageRecord.getSize()));
             }
-        } else if (usageRecord.getUsageType() == UsageTypes.LOAD_BALANCER_POLICY) {
-            //Load Balancer Policy ID
-            LoadBalancerVO lb = _entityMgr.findByIdIncludingRemoved(LoadBalancerVO.class, usageRecord.getUsageId().toString());
-            resourceType = ResourceObjectType.LoadBalancer;
+            usageRecResponse.setDescription(builder.toString());
+        }
+        return resourceDetails;
+    }
+
+    private UsageResourceDetails populateLoadBalancerPolicyUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat) {
+        UsageResourceDetails resourceDetails = new UsageResourceDetails();
+        //Load Balancer Policy ID
+        LoadBalancerVO lb = _entityMgr.findByIdIncludingRemoved(LoadBalancerVO.class, usageRecord.getUsageId());
+        resourceDetails.resourceType = ResourceObjectType.LoadBalancer;
+        if (lb != null) {
+            usageRecResponse.setUsageId(lb.getUuid());
+            resourceDetails.resourceId = lb.getId();
+        }
+        if (!oldFormat) {
+            final StringBuilder builder = new StringBuilder();
+            builder.append("Loadbalancer policy usage ");
             if (lb != null) {
-                usageRecResponse.setUsageId(lb.getUuid());
-                resourceId = lb.getId();
-            }
-            if (!oldFormat) {
-                final StringBuilder builder = new StringBuilder();
-                builder.append("Loadbalancer policy usage ");
-                if (lb != null) {
-                    builder.append(lb.getName()).append(" (").append(lb.getUuid()).append(")");
-                }
-                usageRecResponse.setDescription(builder.toString());
+                builder.append(lb.getName()).append(" (").append(lb.getUuid()).append(")");
             }
-        } else if (usageRecord.getUsageType() == UsageTypes.PORT_FORWARDING_RULE) {
-            //Port Forwarding Rule ID
-            PortForwardingRuleVO pf = _entityMgr.findByIdIncludingRemoved(PortForwardingRuleVO.class, usageRecord.getUsageId().toString());
-            resourceType = ResourceObjectType.PortForwardingRule;
+            usageRecResponse.setDescription(builder.toString());
+        }
+        return resourceDetails;
+    }
+
+    private UsageResourceDetails populatePortForwardingRuleUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat) {
+        UsageResourceDetails resourceDetails = new UsageResourceDetails();
+        //Port Forwarding Rule ID
+        PortForwardingRuleVO pf = _entityMgr.findByIdIncludingRemoved(PortForwardingRuleVO.class, usageRecord.getUsageId());
+        resourceDetails.resourceType = ResourceObjectType.PortForwardingRule;
+        if (pf != null) {
+            usageRecResponse.setUsageId(pf.getUuid());
+            resourceDetails.resourceId = pf.getId();
+        }
+        if (!oldFormat) {
+            final StringBuilder builder = new StringBuilder();
+            builder.append("Port forwarding rule usage");
             if (pf != null) {
-                usageRecResponse.setUsageId(pf.getUuid());
-                resourceId = pf.getId();
-            }
-            if (!oldFormat) {
-                final StringBuilder builder = new StringBuilder();
-                builder.append("Port forwarding rule usage");
-                if (pf != null) {
-                    builder.append(" (").append(pf.getUuid()).append(")");
-                }
-                usageRecResponse.setDescription(builder.toString());
+                builder.append(" (").append(pf.getUuid()).append(")");
             }
-        } else if (usageRecord.getUsageType() == UsageTypes.NETWORK_OFFERING) {
-            //Network Offering Id
-            NetworkOfferingVO netOff = _entityMgr.findByIdIncludingRemoved(NetworkOfferingVO.class, usageRecord.getOfferingId().toString());
+            usageRecResponse.setDescription(builder.toString());
+        }
+        return resourceDetails;
+    }
+
+    private UsageResourceDetails populateNetworkOfferingUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat, VMInstanceVO vmInstance) {
+        //Network Offering Id
+        NetworkOfferingVO netOff = _entityMgr.findByIdIncludingRemoved(NetworkOfferingVO.class, usageRecord.getOfferingId());
+        if (netOff != null) {
             usageRecResponse.setOfferingId(netOff.getUuid());
-            //is Default
-            usageRecResponse.setDefault(usageRecord.getUsageId() == 1);
-            if (!oldFormat) {
-                final StringBuilder builder = new StringBuilder();
-                builder.append("Network offering ");
-                if (netOff != null) {
-                    builder.append(netOff.getName()).append(" (").append(netOff.getUuid()).append(") usage ");
-                }
-                if (vmInstance != null) {
-                    builder.append("for VM ").append(vmInstance.getHostName()).append(" (").append(vmInstance.getUuid()).append(") ");
-                }
-                usageRecResponse.setDescription(builder.toString());
+        }
+        //is Default
+        usageRecResponse.setDefault(usageRecord.getUsageId() == 1);
+        if (!oldFormat) {
+            final StringBuilder builder = new StringBuilder();
+            builder.append("Network offering ");
+            if (netOff != null) {
+                builder.append(netOff.getName()).append(" (").append(netOff.getUuid()).append(") usage ");
             }
-        } else if (usageRecord.getUsageType() == UsageTypes.VPN_USERS) {
-            //VPN User ID
-            VpnUserVO vpnUser = _entityMgr.findByIdIncludingRemoved(VpnUserVO.class, usageRecord.getUsageId().toString());
-            if (vpnUser != null) {
-                usageRecResponse.setUsageId(vpnUser.getUuid());
+            if (vmInstance != null) {
+                builder.append("for VM ").append(vmInstance.getHostName()).append(" (").append(vmInstance.getUuid()).append(") ");
             }
-            if (!oldFormat) {
-                final StringBuilder builder = new StringBuilder();
-                builder.append("VPN usage ");
-                if (vpnUser != null) {
-                    builder.append("for user ").append(vpnUser.getUsername()).append(" (").append(vpnUser.getUuid()).append(")");
-                }
-                usageRecResponse.setDescription(builder.toString());
+            usageRecResponse.setDescription(builder.toString());
+        }
+        return new UsageResourceDetails();
+    }
+
+    private UsageResourceDetails populateVpnUsersUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat) {
+        //VPN User ID
+        VpnUserVO vpnUser = _entityMgr.findByIdIncludingRemoved(VpnUserVO.class, usageRecord.getUsageId());
+        if (vpnUser != null) {
+            usageRecResponse.setUsageId(vpnUser.getUuid());
+        }
+        if (!oldFormat) {
+            final StringBuilder builder = new StringBuilder();
+            builder.append("VPN usage ");
+            if (vpnUser != null) {
+                builder.append("for user ").append(vpnUser.getUsername()).append(" (").append(vpnUser.getUuid()).append(")");
             }
-        } else if (usageRecord.getUsageType() == UsageTypes.SECURITY_GROUP) {
-            //Security Group Id
-            SecurityGroupVO sg = _entityMgr.findByIdIncludingRemoved(SecurityGroupVO.class, usageRecord.getUsageId().toString());
-            resourceType = ResourceObjectType.SecurityGroup;
+            usageRecResponse.setDescription(builder.toString());
+        }
+        return new UsageResourceDetails();
+    }
+
+    private UsageResourceDetails populateSecurityGroupUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat, VMInstanceVO vmInstance) {
+        UsageResourceDetails resourceDetails = new UsageResourceDetails();
+        //Security Group Id
+        SecurityGroupVO sg = _entityMgr.findByIdIncludingRemoved(SecurityGroupVO.class, usageRecord.getUsageId());
+        resourceDetails.resourceType = ResourceObjectType.SecurityGroup;
+        if (sg != null) {
+            resourceDetails.resourceId = sg.getId();
+            usageRecResponse.setUsageId(sg.getUuid());
+        }
+        if (!oldFormat) {
+            final StringBuilder builder = new StringBuilder();
+            builder.append("Security group");
             if (sg != null) {
-                resourceId = sg.getId();
-                usageRecResponse.setUsageId(sg.getUuid());
-            }
-            if (!oldFormat) {
-                final StringBuilder builder = new StringBuilder();
-                builder.append("Security group");
-                if (sg != null) {
-                    builder.append(" ").append(sg.getName()).append(" (").append(sg.getUuid()).append(") usage");
-                }
-                if (vmInstance != null) {
-                    builder.append(" for VM ").append(vmInstance.getHostName()).append(" (").append(vmInstance.getUuid()).append(")");
-                }
-                usageRecResponse.setDescription(builder.toString());
+                builder.append(" ").append(sg.getName()).append(" (").append(sg.getUuid()).append(") usage");
             }
-        } else if (usageRecord.getUsageType() == UsageTypes.BACKUP) {
-            resourceType = ResourceObjectType.Backup;
-            final StringBuilder builder = new StringBuilder();
-            builder.append("Backup usage");
             if (vmInstance != null) {
-                resourceId = vmInstance.getId();
-                usageRecResponse.setResourceName(vmInstance.getInstanceName());
-                usageRecResponse.setUsageId(vmInstance.getUuid());
-                builder.append(" for VM ").append(vmInstance.getHostName())
-                        .append(" (").append(vmInstance.getUuid()).append(")");
-                final BackupOffering backupOffering = backupOfferingDao.findByIdIncludingRemoved(usageRecord.getOfferingId());
-                if (backupOffering != null) {
-                    builder.append(" and backup offering ").append(backupOffering.getName())
-                            .append(" (").append(backupOffering.getUuid()).append(", user ad-hoc/scheduled backup allowed: ")
-                            .append(backupOffering.isUserDrivenBackupAllowed()).append(")");
-                }
+                builder.append(" for VM ").append(vmInstance.getHostName()).append(" (").append(vmInstance.getUuid()).append(")");
             }
+            usageRecResponse.setDescription(builder.toString());
+        }
+        return resourceDetails;
+    }
+
+    private UsageResourceDetails populateBackupUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, VMInstanceVO vmInstance) {
+        UsageResourceDetails resourceDetails = new UsageResourceDetails();
+        resourceDetails.resourceType = ResourceObjectType.Backup;
+        final StringBuilder builder = new StringBuilder();
+        builder.append("Backup usage");
+        if (vmInstance != null) {
+            resourceDetails.resourceId = vmInstance.getId();
+            usageRecResponse.setResourceName(vmInstance.getInstanceName());
+            usageRecResponse.setUsageId(vmInstance.getUuid());
+            builder.append(" for VM ").append(vmInstance.getHostName())
+                    .append(" (").append(vmInstance.getUuid()).append(")");
+            final BackupOffering backupOffering = backupOfferingDao.findByIdIncludingRemoved(usageRecord.getOfferingId());
+            if (backupOffering != null) {
+                builder.append(" and backup offering ").append(backupOffering.getName())
+                        .append(" (").append(backupOffering.getUuid()).append(", user ad-hoc/scheduled backup allowed: ")
+                        .append(backupOffering.isUserDrivenBackupAllowed()).append(")");
+            }
+        }
+        if (usageRecord.getSize() != null) {
             builder.append(" with size ").append(toHumanReadableSize(usageRecord.getSize()));
+        }
+        if (usageRecord.getVirtualSize() != null) {
             builder.append(" and with virtual size ").append(toHumanReadableSize(usageRecord.getVirtualSize()));
-            usageRecResponse.setDescription(builder.toString());
-            usageRecResponse.setSize(usageRecord.getSize());
-            usageRecResponse.setVirtualSize(usageRecord.getVirtualSize());
-        } else if (usageRecord.getUsageType() == UsageTypes.VM_SNAPSHOT) {
-            resourceType = ResourceObjectType.VMSnapshot;
-            VMSnapshotVO vmSnapshotVO = null;
-            if (usageRecord.getUsageId() != null) {
-                vmSnapshotVO = vmSnapshotDao.findByIdIncludingRemoved(usageRecord.getUsageId());
-                if (vmSnapshotVO != null) {
-                    resourceId = vmSnapshotVO.getId();
-                    usageRecResponse.setResourceName(vmSnapshotVO.getDisplayName());
-                    usageRecResponse.setUsageId(vmSnapshotVO.getUuid());
-                }
+        }
+        usageRecResponse.setDescription(builder.toString());
+        usageRecResponse.setSize(usageRecord.getSize());
+        usageRecResponse.setVirtualSize(usageRecord.getVirtualSize());
+        return resourceDetails;
+    }
+
+    private UsageResourceDetails populateVmSnapshotUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat, VMInstanceVO vmInstance) {
+        UsageResourceDetails resourceDetails = new UsageResourceDetails();
+        resourceDetails.resourceType = ResourceObjectType.VMSnapshot;
+        VMSnapshotVO vmSnapshotVO = null;
+        if (usageRecord.getUsageId() != null) {
+            vmSnapshotVO = vmSnapshotDao.findByIdIncludingRemoved(usageRecord.getUsageId());
+            if (vmSnapshotVO != null) {
+                resourceDetails.resourceId = vmSnapshotVO.getId();
+                usageRecResponse.setResourceName(vmSnapshotVO.getDisplayName());
+                usageRecResponse.setUsageId(vmSnapshotVO.getUuid());
             }
-            usageRecResponse.setSize(usageRecord.getSize());
-            if (usageRecord.getVirtualSize() != null) {
-                usageRecResponse.setVirtualSize(usageRecord.getVirtualSize());
+        }
+        usageRecResponse.setSize(usageRecord.getSize());
+        if (usageRecord.getVirtualSize() != null) {
+            usageRecResponse.setVirtualSize(usageRecord.getVirtualSize());
+        }
+        if (usageRecord.getOfferingId() != null) {
+            usageRecResponse.setOfferingId(usageRecord.getOfferingId().toString());
+        }
+        if (!oldFormat) {
+            VolumeVO volume = null;
+            if (vmSnapshotVO == null && usageRecord.getUsageId() != null) {
+                 volume = _entityMgr.findByIdIncludingRemoved(VolumeVO.class, usageRecord.getUsageId());
             }
+
+            DiskOfferingVO diskOff = null;
             if (usageRecord.getOfferingId() != null) {
-                usageRecResponse.setOfferingId(usageRecord.getOfferingId().toString());
+                diskOff = _entityMgr.findByIdIncludingRemoved(DiskOfferingVO.class, usageRecord.getOfferingId());
             }
-            if (!oldFormat) {
-                VolumeVO volume = null;
-                if (vmSnapshotVO == null && usageRecord.getUsageId() != null) {
-                     volume = _entityMgr.findByIdIncludingRemoved(VolumeVO.class, usageRecord.getUsageId().toString());
-                }
-
-                DiskOfferingVO diskOff = null;
-                if (usageRecord.getOfferingId() != null) {
-                    diskOff = _entityMgr.findByIdIncludingRemoved(DiskOfferingVO.class, usageRecord.getOfferingId());
-                }
-                final StringBuilder builder = new StringBuilder();
-                builder.append("VMSnapshot usage");
-                if (vmSnapshotVO != null) {
-                    builder.append(" Id: ").append(vmSnapshotVO.getUuid());
-                }
-                if (vmInstance != null) {
-                    builder.append(" for VM ").append(vmInstance.getHostName()).append(" (").append(vmInstance.getUuid()).append(")");
-                }
-                if (volume != null) {
-                    builder.append(" with volume ").append(volume.getName()).append(" (").append(volume.getUuid()).append(")");
-                }
-                if (diskOff != null) {
-                    builder.append(" using disk offering ").append(diskOff.getName()).append(" (").append(diskOff.getUuid()).append(")");
-                }
-                if (usageRecord.getSize() != null){
-                    builder.append(" and size " + toHumanReadableSize(usageRecord.getSize()));
-                }
-                usageRecResponse.setDescription(builder.toString());
+            final StringBuilder builder = new StringBuilder();
+            builder.append("VMSnapshot usage");
+            if (vmSnapshotVO != null) {
+                builder.append(" Id: ").append(vmSnapshotVO.getUuid());
             }
-        } else if (usageRecord.getUsageType() == UsageTypes.VOLUME_SECONDARY) {
-            VolumeVO volume = _entityMgr.findByIdIncludingRemoved(VolumeVO.class, usageRecord.getUsageId().toString());
-            if (!oldFormat) {
-                final StringBuilder builder = new StringBuilder();
-                builder.append("Volume on secondary storage usage");
-                if (volume != null) {
-                    builder.append(" for ").append(volume.getName()).append(" (").append(volume.getUuid()).append(") ")
-                            .append("with size ").append(toHumanReadableSize(usageRecord.getSize()));
-                }
-                usageRecResponse.setDescription(builder.toString());
+            if (vmInstance != null) {
+                builder.append(" for VM ").append(vmInstance.getHostName()).append(" (").append(vmInstance.getUuid()).append(")");
             }
-        } else if (usageRecord.getUsageType() == UsageTypes.VM_SNAPSHOT_ON_PRIMARY) {
-            resourceType = ResourceObjectType.VMSnapshot;
-            VMSnapshotVO vmSnapshotVO = null;
-            if (usageRecord.getUsageId() != null) {
-                vmSnapshotVO = vmSnapshotDao.findByIdIncludingRemoved(usageRecord.getUsageId());
-                if (vmSnapshotVO != null) {
-                    resourceId = vmSnapshotVO.getId();
-                    usageRecResponse.setResourceName(vmSnapshotVO.getDisplayName());
-                    usageRecResponse.setUsageId(vmSnapshotVO.getUuid());
-                }
+            if (volume != null) {
+                builder.append(" with volume ").append(volume.getName()).append(" (").append(volume.getUuid()).append(")");
             }
-            usageRecResponse.setSize(usageRecord.getVirtualSize());
-            if (!oldFormat) {
-                final StringBuilder builder = new StringBuilder();
-                builder.append("VMSnapshot on primary storage usage");
-                if (vmSnapshotVO != null) {
-                    builder.append(" Id: ").append(vmSnapshotVO.getUuid());
-                }
-                if (vmInstance != null) {
-                    builder.append(" for VM ").append(vmInstance.getHostName()).append(" (").append(vmInstance.getUuid()).append(") ")
-                            .append("with size ").append(toHumanReadableSize(usageRecord.getVirtualSize()));
-                }
-                usageRecResponse.setDescription(builder.toString());
+            if (diskOff != null) {
+                builder.append(" using disk offering ").append(diskOff.getName()).append(" (").append(diskOff.getUuid()).append(")");
             }
-        } else if (usageRecord.getUsageType() == UsageTypes.BUCKET) {
-            BucketVO bucket = _entityMgr.findByIdIncludingRemoved(BucketVO.class, usageRecord.getUsageId().toString());
-            usageRecResponse.setUsageId(bucket.getUuid());
-            usageRecResponse.setResourceName(bucket.getName());
-        }
-        if(resourceTagResponseMap != null && resourceTagResponseMap.get(resourceId + ":" + resourceType) != null) {
-             usageRecResponse.setTags(resourceTagResponseMap.get(resourceId + ":" + resourceType));
+            if (usageRecord.getSize() != null){
+                builder.append(" and size " + toHumanReadableSize(usageRecord.getSize()));
+            }
+            usageRecResponse.setDescription(builder.toString());
         }
+        return resourceDetails;
+    }
 
-        if (usageRecord.getRawUsage() != null) {
-            DecimalFormat decimalFormat = new DecimalFormat("###########.######");
-            usageRecResponse.setRawUsage(decimalFormat.format(usageRecord.getRawUsage()));
+    private UsageResourceDetails populateVolumeSecondaryUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat) {
+        VolumeVO volume = _entityMgr.findByIdIncludingRemoved(VolumeVO.class, usageRecord.getUsageId());
+        if (!oldFormat) {
+            final StringBuilder builder = new StringBuilder();
+            builder.append("Volume on secondary storage usage");
+            if (volume != null) {
+                builder.append(" for ").append(volume.getName()).append(" (").append(volume.getUuid()).append(") ");
+                if (usageRecord.getSize() != null) {
+                    builder.append("with size ").append(toHumanReadableSize(usageRecord.getSize()));
+                }
+            }
+            usageRecResponse.setDescription(builder.toString());
         }
+        return new UsageResourceDetails();
+    }
 
-        if (usageRecord.getStartDate() != null) {
-            usageRecResponse.setStartDate(usageRecord.getStartDate());
+    private UsageResourceDetails populateVmSnapshotOnPrimaryUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse, boolean oldFormat, VMInstanceVO vmInstance) {
+        UsageResourceDetails resourceDetails = new UsageResourceDetails();
+        resourceDetails.resourceType = ResourceObjectType.VMSnapshot;
+        VMSnapshotVO vmSnapshotVO = null;
+        if (usageRecord.getUsageId() != null) {
+            vmSnapshotVO = vmSnapshotDao.findByIdIncludingRemoved(usageRecord.getUsageId());
+            if (vmSnapshotVO != null) {
+                resourceDetails.resourceId = vmSnapshotVO.getId();
+                usageRecResponse.setResourceName(vmSnapshotVO.getDisplayName());
+                usageRecResponse.setUsageId(vmSnapshotVO.getUuid());
+            }
         }
-        if (usageRecord.getEndDate() != null) {
-            usageRecResponse.setEndDate(usageRecord.getEndDate());
+        usageRecResponse.setSize(usageRecord.getVirtualSize());
+        if (!oldFormat) {
+            final StringBuilder builder = new StringBuilder();
+            builder.append("VMSnapshot on primary storage usage");
+            if (vmSnapshotVO != null) {
+                builder.append(" Id: ").append(vmSnapshotVO.getUuid());
+            }
+            if (vmInstance != null) {
+                builder.append(" for VM ").append(vmInstance.getHostName()).append(" (").append(vmInstance.getUuid()).append(") ");
+                if (usageRecord.getVirtualSize() != null) {
+                    builder.append("with size ").append(toHumanReadableSize(usageRecord.getVirtualSize()));
+                }
+            }
+            usageRecResponse.setDescription(builder.toString());
         }
+        return resourceDetails;
+    }
 
-        return usageRecResponse;
+    private UsageResourceDetails populateBucketUsageResponse(Usage usageRecord, UsageRecordResponse usageRecResponse) {
+        BucketVO bucket = _entityMgr.findByIdIncludingRemoved(BucketVO.class, usageRecord.getUsageId());
+        if (bucket != null) {
+            usageRecResponse.setUsageId(bucket.getUuid());
+            usageRecResponse.setResourceName(bucket.getName());
+        }
+        return new UsageResourceDetails();
+    }
+
+    private static class UsageResourceDetails {
+        private ResourceObjectType resourceType;
+        private Long resourceId;
     }
 
     public String getDateStringInternal(Date inputDate) {
@@ -4691,6 +4842,7 @@ public NicSecondaryIpResponse createSecondaryIPToNicResponse(NicSecondaryIp resu
         setResponseIpAddress(result, response);
         response.setNicId(nic.getUuid());
         response.setNwId(network.getUuid());
+
         response.setObjectName("nicsecondaryip");
         return response;
     }
@@ -4777,6 +4929,7 @@ public NicResponse createNicResponse(Nic result) {
                 for (NicSecondaryIpVO ip : secondaryIps) {
                     NicSecondaryIpResponse ipRes = new NicSecondaryIpResponse();
                     ipRes.setId(ip.getUuid());
+
                     setResponseIpAddress(ip, ipRes);
                     ipList.add(ipRes);
                 }
@@ -4806,6 +4959,7 @@ public NicResponse createNicResponse(Nic result) {
             VpcVO vpc = _entityMgr.findByUuidIncludingRemoved(VpcVO.class, userVm.getVpcUuid());
             response.setVpcName(vpc.getName());
         }
+
         return response;
     }
 
@@ -5243,12 +5397,12 @@ public NetworkPermissionsResponse createNetworkPermissionsResponse(NetworkPermis
     protected void handleCertificateResponse(String certStr, DirectDownloadCertificateResponse response) {
         try {
             Certificate cert = CertificateHelper.buildCertificate(certStr);
-            if (cert instanceof X509CertImpl) {
-                X509CertImpl certificate = (X509CertImpl) cert;
+            if (cert instanceof X509Certificate) {
+                X509Certificate certificate = (X509Certificate) cert;
                 response.setVersion(String.valueOf(certificate.getVersion()));
                 response.setSubject(certificate.getSubjectDN().toString());
                 response.setIssuer(certificate.getIssuerDN().toString());
-                response.setSerialNum(certificate.getSerialNumberObject().toString());
+                response.setSerialNum(certificate.getSerialNumber().toString());
                 response.setValidity(String.format("From: [%s] - To: [%s]", certificate.getNotBefore(), certificate.getNotAfter()));
             }
         } catch (CertificateException e) {