initial commit on query - replace SQL and ResultSet
change diag
Finish architecture modification - query and datacontent