Rework on AsyncTasks