Switched volumes to use v2 style definition for more flexibility