Yes to enforce the Star Schema, You may move measures to to Trips fact and as per definition any table that is referenced via foreign key from a fact table is a dimension table. Also check out how to best model Payment and Payment Line Items here - https://www.kimballgroup.com/2007/10/design-tip-95-patterns-to-avoid-when-modeling-headerline-item-transactions/