Removed the usage of id property to get a handle on the type criteria field and replaced it with a ref property and added a ref property to the corresponding parents.
Authored by: cosbor11 2012-08-06
Parent: [r6294]
Child: [r6296]