Add basic validation of Containers

Builds on #329