Added null storage interface