More partial mutable entityType work