diff --git a/client/pom.xml b/client/pom.xml
index 39f1cb0d1a6..aba46cec031 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -189,6 +189,11 @@
         <artifactId>cloud-engine-storage</artifactId>
         <version>${project.version}</version>
     </dependency>
+    <dependency>
+        <groupId>org.apache.cloudstack</groupId>
+        <artifactId>cloud-engine-storage-cache</artifactId>
+        <version>${project.version}</version>
+    </dependency>
     <dependency>
         <groupId>org.apache.cloudstack</groupId>
         <artifactId>cloud-engine-storage-backup</artifactId>
@@ -201,7 +206,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.cloudstack</groupId>
-        <artifactId>cloud-engine-storage-imagemotion</artifactId>
+        <artifactId>cloud-engine-storage-datamotion</artifactId>
         <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in
index 7bbcf0959a8..9361e03476d 100644
--- a/client/tomcatconf/applicationContext.xml.in
+++ b/client/tomcatconf/applicationContext.xml.in
@@ -213,7 +213,6 @@
   <bean id="guestOSCategoryDaoImpl" class="com.cloud.storage.dao.GuestOSCategoryDaoImpl" />
   <bean id="guestOSDaoImpl" class="com.cloud.storage.dao.GuestOSDaoImpl" />
   <bean id="guestOSHypervisorDaoImpl" class="com.cloud.storage.dao.GuestOSHypervisorDaoImpl" />
-  <bean id="guestOSDaoImpl" class="com.cloud.storage.dao.GuestOSDaoImpl" />  
   <bean id="highAvailabilityDaoImpl" class="com.cloud.ha.dao.HighAvailabilityDaoImpl" />
   <bean id="hostDaoImpl" class="com.cloud.host.dao.HostDaoImpl" />
   <bean id="engineHostDetailsDaoImpl" class="org.apache.cloudstack.engine.datacenter.entity.api.db.dao.HostDetailsDaoImpl" />
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index f54cf573fa7..379c3fdf8d1 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -30,12 +30,12 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'Agent
 ALTER TABLE `cloud`.`load_balancer_vm_map` ADD state VARCHAR(40) NULL COMMENT 'service status updated by LB healthcheck manager';
 
 alter table storage_pool change storage_provider_id storage_provider_name varchar(255);
-alter table template_host_ref add state varchar(255);
-alter table template_host_ref add update_count bigint unsigned;
-alter table template_host_ref add updated datetime;
-alter table volume_host_ref add state varchar(255);
-alter table volume_host_ref add update_count bigint unsigned;
-alter table volume_host_ref add updated datetime;
+-- alter table template_host_ref add state varchar(255);
+-- alter table template_host_ref add update_count bigint unsigned;
+-- alter table template_host_ref add updated datetime;
+-- alter table volume_host_ref add state varchar(255);
+-- alter table volume_host_ref add update_count bigint unsigned;
+-- alter table volume_host_ref add updated datetime;
 alter table template_spool_ref add updated datetime;
 CREATE TABLE  `cloud`.`object_datastore_ref` (
   `id` bigint unsigned NOT NULL auto_increment,
@@ -652,12 +652,12 @@ CREATE VIEW `cloud`.`volume_view` AS
         vm_instance.state vm_state,
         vm_instance.vm_type,
         user_vm.display_name vm_display_name,
-        volume_host_ref.size volume_host_size,
-        volume_host_ref.created volume_host_created,
-        volume_host_ref.format,
-        volume_host_ref.download_pct,
-        volume_host_ref.download_state,
-        volume_host_ref.error_str,
+        volume_store_ref.size volume_host_size,
+        volume_store_ref.created volume_host_created,
+        volume_store_ref.format,
+        volume_store_ref.download_pct,
+        volume_store_ref.download_state,
+        volume_store_ref.error_str,
         disk_offering.id disk_offering_id,
         disk_offering.uuid disk_offering_uuid,
         disk_offering.name disk_offering_name,