Move to standard node structure