Reverted changes: there's now only Task class