Added token methods back