Added changes to Layer, automaton and LDS