Improve socket