Updated model for flights and trips