Changed taskmapping