Updated index API to new fix