Updated to new storage pool model