Added token functionality