Add interface for querying