Feature/socket