Add index for simulator