Fix entity mappings for activity role