Added more token information