HG-126 implement GA tracking and wrapper for both