More flexibility with entity key mapping