Maybe we should remove also these node attributes and just grab them directly from within the instance?