Updated the tweet_id field to match the 7.x branch