Added check for Task List