Add index computation