Added storage interface