More additions to the experimental entity model.