Corrected token types