Updated the Tracker Framework to work with the Refactored Common Framework