Expanded task class to include all columns