Revised entity schema [MRB]