Reintroduce container validation