Integrating into renamed TaskBase (TaskTrackerBase) and TrackerPackage (TaskTrackerPackage)