Updated for new node layout in database