Added ZwaveNode to the mix.