Fixed entity mapping