Extended entity mappings