Added templates for passengers and address