Re-implemented DataSet for schema changes