Move to API instead of index, create one