Cleaned the Schemaparser, Updated the examples to use the new syntax