Added Trip and SubTrip