Added better retweet support