DiskProxy refactoring