Bugfix: Adapted to new node structure