Refactor OrcStorageManager