Made the node more flexible and dynamic