Added more token definitions