Move to real service
analyze query support