Added token handling to nodes