server: Refactor storage object properties