update token fields
add entities