Updating/saving nodes is a bit smarter now