Wrapper changes for node