Make the staging work with new nodes