[RFR] Use same entity structure everywhere