changed to common storage interface