Added token generation