Changed tracking to include more of the tracking graph
Refactored parameter definition to include units and be more flexible