support for socket_storage added.