#10 added extended token types