Added more properties to the nodes in attempt to make them work