Added null storage option.