Refactor content tokens and lookup