Use same entity structure everywhere