Added schema validator