add some querying ability