Add Socket Support