Refactor volumes