diff --git a/server/src/com/cloud/api/BaseCmd.java b/server/src/com/cloud/api/BaseCmd.java
index a6907254abd..3dc12213661 100644
--- a/server/src/com/cloud/api/BaseCmd.java
+++ b/server/src/com/cloud/api/BaseCmd.java
@@ -252,6 +252,7 @@ public abstract class BaseCmd {
         PERCENT_USED("percentused", BaseCmd.TYPE_STRING, "percentused"),
         POD_ID("podid", BaseCmd.TYPE_LONG, "podId"),
         POD_NAME("podname", BaseCmd.TYPE_STRING, "podName"),
+        POOL_ID("poolid", BaseCmd.TYPE_LONG, "poolId"),
         POOL_NAME("poolname", BaseCmd.TYPE_STRING, "poolName"),
         PRIVATE_IP("privateip", BaseCmd.TYPE_STRING, "privateIp"),
         PRIVATE_MAC_ADDRESS("privatemacaddress", BaseCmd.TYPE_STRING, "privatemacaddress"),
@@ -286,11 +287,13 @@ public abstract class BaseCmd {
         START_VLAN("startvlan", BaseCmd.TYPE_LONG, "startvlan"),
         END_VLAN("endvlan", BaseCmd.TYPE_LONG, "endvlan"),
         SIZE("size", BaseCmd.TYPE_LONG, "size"),
-        SIZE_NETAPP_VOL("netappvolsize", BaseCmd.TYPE_STRING, "netappvolsize"),
+        VOL_SIZE("volsize", BaseCmd.TYPE_STRING, "volsize"),
         STATE("state", BaseCmd.TYPE_STRING, "state"),
         STORAGE("storage", BaseCmd.TYPE_LONG, "storage"),
         SUCCESS("success", BaseCmd.TYPE_BOOLEAN, "success"),
         SNAPSHOT_ID("snapshotid", BaseCmd.TYPE_LONG, "snapshotid"),
+        SNAPSHOT_POLICY("snapshotpolicy", BaseCmd.TYPE_STRING, "snapshotPolicy"),
+        SNAPSHOT_RESERVATION("snapshotreservation", BaseCmd.TYPE_STRING, "snapshotReservation"),
         SNAPSHOT_POLICY_ID("snapshotpolicyid", BaseCmd.TYPE_LONG, "snapshotPolicyId"),
         SNAPSHOT_TYPE("snapshottype", BaseCmd.TYPE_STRING, "snapshotType"),
         SNAPSHOT_STRING("snapshotstring", BaseCmd.TYPE_STRING, "snapshotString"),
diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index b839aa481ed..c7c53beaec4 100644
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -77,24 +77,19 @@ DROP TABLE IF EXISTS `cloud`.`cluster`;
 /*DO NOT DELETE*/
 /*
 DROP TABLE IF EXISTS `cloud`.`netapp_storage_pool`;
-DROP TABLE IF EXISTS `cloud`.`netapp_volume`;
 
 CREATE TABLE `cloud`.`netapp_storage_pool` (
   `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id',
   `ip_address` varchar(15) NOT NULL COMMENT 'ip address of the pool/volume',
-  `aggregate_name` varchar(255) NOT NULL COMMENT 'name for the aggregate',
   `pool_name` varchar(255) NOT NULL COMMENT 'name for the pool/volume',
+  `aggregate_name` varchar(255) NOT NULL COMMENT 'name for the aggregate',
+  `volume_name` varchar(255) NOT NULL COMMENT 'name for the volume',
+  `volume_size` varchar(255) NOT NULL COMMENT 'volume size',
+  `snapshot_policy` varchar(255) NOT NULL COMMENT 'snapshot policy',
+  `snapshot_reservation` varchar(255) NOT NULL COMMENT 'snapshot reservation',  
   `username` varchar(255) NOT NULL COMMENT 'username',  
   `password` varchar(200) COMMENT 'password',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE `cloud`.`netapp_volume` (
-  `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id',
-  `pool_id` bigint unsigned NOT NULL COMMENT 'pool id',
-  `volume_name` varchar(255) NOT NULL COMMENT 'name for the volume',
-  `aggregate_name` varchar(255) NOT NULL COMMENT 'name for the aggregate',
-  `size` varchar(255) NOT NULL COMMENT 'volume size',
+  `round_robin_marker` int COMMENT 'This marks the volume to be picked up for lun creation, RR fashion',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 */