Started to expand query support