add socket query support