Modified entity mapping