Feature/indicators map