Changes on socket module