Added token struct