refactored storage classes