Adding datacontext to pull unique keys into more of the system.  This
will allow all of teh objects to be hashable and identifiable.