Master refactor with enqueMapTasks