[WIP] Use same entity structure everywhere