Socket implementation further enhanced