Removed AsyncTask and moved to a Service