Switch to com.datasift package