Updated to include both Universal and Classic analytics