Added StorageDev (In progress)