Fix to the schema files
Cleanup
Added extension validator