Updated index for completeness