added support for plug-n-play leaf device