Adding build query support