Added logic to handle consolidated storage option.