Feature/universal analytics