Changes for DG. Add srcfile and srctype for obj constr and entity constr, also te fix by Don C