Switched to nodes instead of attributes