Add trip models and adjust the template