Corrected entity mapping