Entities schema and documentation changes [MRB]