Added tasklist support