Attempt to update Analytics to use GA events