Better socket organisation