Revert "Switched to nodes instead of attributes"

This reverts commit ba29722a045468996a11e30d5a87d4bcfc26164f.