Added support for different device nodes