Token validation now includes terminal tokens