Made map tasks reusable