Remove some using statements
fix node name display
add Servers support