Export StorageLevel and refactor