Changed anchor handling & nodes