Fixed entity mapping.