Adding support to auto-register node