Added more for maps and asynctask