Add more mappings and indices