Schema and documentation changes [MRB]