Removed dependency on TaskStatus