Include colon, period and question mark tokens
update main spec