Previously quite liberal schema made more strict.