Added Models for Trips and Measurements