Moving volume creation out