Changed entity mapping