Refactor cluster storage