Restructured into a simple data->node relation