Add analytic and timer