Integrating latent variables in discrete choice models