Added option for socket