Improved DataSift support