Changed task to core mapping