Refactoring to more flexible node/join execution