Add support for short node name