entities.rng interface annotation code changes [MRB]