Beefed up query ability