I don't think we need to add this property, you can use the `EntityId` to get the object and they query for its type