Changes to let SgMarshal respect relation class_names

Ouch. My head hurts.
We need the sleep in the data-set select. :(