Removed old query interface