[Judicial Decision] Correcting entities architecture.