Added socket support
Added socket support