Aligned the schema validator with the one used in start.