 
 CREATE OR REPLACE VIEW dwh_vm_disk_configuration_history_view
 AS
-SELECT i.image_guid AS vm_disk_id,
+SELECT d.disk_id AS vm_disk_id,
+       d.disk_alias as vm_disk_name,
+       d.disk_description as vm_disk_description,
+       i.image_guid AS image_id,
        image_storage_domain_map.storage_domain_id as storage_domain_id,
        cast(d.internal_drive_mapping as smallint) as vm_internal_drive_mapping,
-       d.disk_description as vm_disk_description,
        cast(i.size / 1048576 as int) as vm_disk_size_mb,
        cast(i.volume_type as smallint) AS vm_disk_type,
        cast(i.volume_format as smallint) AS vm_disk_format,

           WHEN d.disk_interface = 'SCSI' THEN cast(1 as smallint)
           WHEN d.disk_interface = 'VirtIO' THEN cast(2 as smallint)
       END AS vm_disk_interface,
       i._create_date AS create_date,
       i._update_date AS update_date
FROM   images as i
           INNER JOIN
               base_disks as d ON i.image_group_id = d.disk_id
           INNER JOIN
               vm_device as vd ON d.disk_id = vd.device_id
		              INNER JOIN
		                  vm_static ON vm_static.vm_guid = vd.vm_id
           INNER JOIN
               image_storage_domain_map ON image_storage_domain_map.image_id = i.image_guid
WHERE     i.active = true AND
                 vm_static.entity_type = 'VM' AND
          (i._create_date >
                          (SELECT     var_datetime
                           FROM         dwh_history_timekeeping

	disk_image_dynamic.write_latency_seconds as write_latency_seconds,
	disk_image_dynamic.flush_latency_seconds as flush_latency_seconds
FROM    images
            INNER JOIN
                 disk_image_dynamic ON images.image_guid = disk_image_dynamic.image_id
            INNER JOIN
                 base_disks as d ON images.image_group_id = d.disk_id
            LEFT OUTER JOIN vm_device ON vm_device.device_id = images.image_group_id
                                LEFT OUTER JOIN vm_static ON vm_static.vm_guid = vm_device.vm_id
WHERE images.active = true AND
      (vm_static.entity_type = 'VM' OR vm_static.entity_type IS NULL);

CREATE OR REPLACE VIEW dwh_remove_tags_relations_history_view AS
SELECT    tag_id as entity_id,
