Add sophisticated work-tracking mechanism