Update TokenController scope logic