Update old analytics code to allow demographic information