Better organization of simulation properties
Some error on expression construction solved