Volumes group allocation refactoring