* added return parameters for query generator in Database extension.