XXX Support for adding additional disks. DO NOT MERGE.