Swapped Trackers & Triggers to match key, value style