Add index for 2.40 api additions