Added in entities for Trip