Add validation of Volumes

Builds on #326