Updated to avoid node attributes for now.