added reference to raw id fields