Move instances and volumes into their own definitions