Initial integration with ModelicaRes
Moved regular expression matching to ModelicaRes