Move Analytics to Includes