Refactoring
High level querying allows specifying instruments now. See issue #2.