Little fixes

* Change the schema.
* Refactoring indentation.
* Add new validations to documents.