Small enhancement : better query object and relationship with socket