Entity schema and documentation changes [MRB]