Fair point, but I don't want to mess with ModelEntityBase in this branch.