Now the structures do not get passed around anymore.
Property now stored with the Property automaton.