Corrected entity design.