Modify indicator parsing
Modify parser to adapt to last changes in the model