Added a few elements of the schema