Add missing indices.
Add partof behavior.