Data wrapper: added query interface