Index Extension - Fix backward compatibility