Packager changes, smarter 'Add a Node' behavior