Created by: Durman
Usage of the node decorator is removed also extra code for supporting old layouts is added