Added AsyncTask support