Add query capabilities, add comments