Added tasklist mapping