Changing this around to move things back into the GenericDAO