Added extended tokens to database