Add trackedObject and Trick classes