Add basic support for feature queries