Add index for non-JB's devices