Added nodes support