Added API and removed AsyncTasks