Update for the new static index