Added more nodey goodness