Added analysis code, update data_model for trip_types