Add validation of Volumes

Builds on #326
SGTM