Updated index for validation